Resolve UI issue.

.circleci/config.yml

@@ -8,13 +8,13 @@ orbs:
 jobs:
   api-deploy:
     docker:
-      - image: cimg/node:18.18.2
+      - image: "cimg/base:stable"
     steps:
       - checkout
       - eb/setup
       - run:
           command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
             eb status --verbose
             eb deploy
             eb status
@@ -42,22 +42,31 @@ jobs:
   app-build:
     docker:
       - image: cimg/node:16.15.0
-    resource_class: large
+
     working_directory: ~/repo/client
 
     steps:
       - checkout:
           path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
-          command: npm i
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
 
-      - run: npm run build
+      - run: yarn run build
 
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-production/"
-          arguments: "--exclude '*.map'"
       - jira/notify
 
   test-hasura-migrate:
@@ -83,22 +92,31 @@ jobs:
   test-app-build:
     docker:
       - image: cimg/node:16.15.0
-    resource_class: large
+
     working_directory: ~/repo/client
 
     steps:
       - checkout:
           path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
-          command: npm i
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
 
-      - run: npm run build:test
+      - run: yarn run build:test
 
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-test/"
-          arguments: "--exclude '*.map'"
       - jira/notify
 
   admin-app-build:
@@ -134,6 +152,10 @@ jobs:
 workflows:
   deploy_and_build:
     jobs:
+      - api-deploy:
+          filters:
+            branches:
+              only: master
       - app-build:
           filters:
             branches:
@@ -155,4 +177,4 @@ workflows:
       #- admin-app-build:
       #filters:
       #branches:
-      #only: master
+      #only: master

.gitignore

@@ -117,6 +117,4 @@ logs/oAuthClient-log.log
 
 .node-persist/**
 
-/*.env.*
+/*.env.*
-.idea/*
-.idea

.npmrc

@@ -1 +0,0 @@
-legacy-peer-deps=true

.prettierrc.js

@@ -1,16 +0,0 @@
-exports.default = {
-  printWidth: 120,
-  useTabs: false,
-  tabWidth: 2,
-  trailingComma: "es5",
-  semi: true,
-  singleQuote: false,
-  bracketSpacing: true,
-  arrowParens: "always",
-  jsxSingleQuote: false,
-  bracketSameLine: false,
-  endOfLine: "lf",
-  importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
-  importOrderSeparation: true,
-  importOrderSortSpecifiers: true,
-};

README.MD

@@ -1,3 +1,14 @@
+Yarn Dependency Management:
+To force upgrades for some packages:
+yarn upgrade-interactive --latest
+
+To Start Hasura CLI:
+npx hasura console
+
+Migrating to Staging:
+npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
+npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
+
 NGROK TEsting:
 ./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
 
@@ -10,4 +21,4 @@ hasura migrate apply --version "1620771761757" --skip-execution --endpoint https
 hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 
 Generate the license file: 
-$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite
+$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite

_reference/reportFiltersAndSorters.md

@@ -1,189 +0,0 @@
-# Filters and Sorters
-
-This documentation details the schema required for `.filters` files on the report server. It is used to dynamically
-modify the graphQL query and provide the user more power over their reports.
-
-For filters and sorters, valid types include (`type` key in the schema):
-- string (default)
-- number
-- bool or boolean
-- date
-
-## Special Notes
-- When passing the data to the template server, the property filters and sorters is added to the data object and will reflect the filters and sorters the user has selected
-
-## High level Schema Overview
-
-```javascript
-const schema = {
-    "filters": [
-        {
-            "name": "jobs.joblines.mod_lb_hrs", // Name and path of the field in the graphQL query
-            "translation": "jobs.joblines.mod_lb_hrs_1", // Translation key for the label used in the GUI
-            "label": "mod_lb_hrs_1",    // Label used in the case the GUI does not contain a translation
-            "type": "number" // Type of field, can be number or string currently
-        },
-        // ... more filters
-    ],
-    "sorters": [
-        {
-            "name": "jobs.joblines.mod_lb_hrs",  // Name and path of the field in the graphQL query
-            "translation": "jobs.joblines.mod_lb_hrs_1",  // Translation key for the label used in the GUI
-            "label": "mod_lb_hrs_1", // Label used in the case the GUI does not contain a translation
-            "type": "number"  // Type of field, can be number or string currently
-        },
-        // ... more sorters
-    ],
-    "dates": {
-        // This is not yet implemented and will be added in a future release
-    }
-}
-```
-
-## Filters
-
-Filters effect the where clause of the graphQL query. They are used to filter the data returned from the server.
-A note on special notation used in the `name` field.
-
-## Reflection
-
-Filters can make use of reflection to pre-fill select boxes, the following is an example of that in the filters file.
-
-```json
-    {
-      "name": "jobs.status",
-      "translation": "jobs.fields.status",
-      "label": "Status",
-      "type": "string",
-      "reflector": {
-        "type": "internal",
-        "name": "special.job_statuses"
-      }
-    }
-```
-
-in this example, a reflector with the type 'internal' (all types at the moment require this, and it is used for future functionality), with a name of `special.job_statuses`
-
-The following cases are available
-
-- `special.job_statuses` - This will reflect the statuses of the jobs table `bodyshop.md_ro_statuses.statuses'`
-- `special.cost_centers` - This will reflect the cost centers `bodyshop.md_responsibility_centers.costs`
-- `special.categories` - This will reflect the categories `bodyshop.md_categories`
-- `special.insurance_companies` - This will reflect the insurance companies `bodyshop.md_ins_cos`'
-- `special.employee_teams` - This will reflect the employee teams `bodyshop.employee_teams`
-- `special.employees` - This will reflect the employees `bodyshop.employees`
-- `special.first_names` - This will reflect the first names `bodyshop.employees`
-- `special.last_names` - This will reflect the last names `bodyshop.employees`
-- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources`
-- `special.class`- This will reflect the class `bodyshop.md_classes`
-- `special.lost_sale_reasons` - This will reflect the lost sale reasons `bodyshop.md_lost_sale_reasons`
-- `special.alt_transports` - This will reflect the alternative transports `bodyshop.appt_alt_transport`
-- `special.payment_types` - This will reflect the payment types `bodyshop.md_payment_types`
-- `special.payment_payers` - This is a special case with a key value set of [Customer, Insurance]
-
-### Path without brackets, multi level
-
-`"name": "jobs.joblines.mod_lb_hrs",`
-This will produce a where clause at the `joblines` level of the graphQL query,
-
-```graphql
-query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!) {
-    jobs(
-        where: {date_invoiced: {_is_null: true}, date_open: {_gte: $starttz, _lte: $endtz}, ro_number: {_is_null: false}, voided: {_eq: false}}
-    ) {
-        joblines(
-            order_by: {line_no: asc}
-            where: {removed: {_eq: false}, mod_lb_hrs: {_lt: 3}}
-        ) {
-            line_no
-            mod_lbr_ty
-            mod_lb_hrs
-            convertedtolbr
-            convertedtolbr_data
-        }
-        ownr_co_nm
-        ownr_fn
-        ownr_ln
-        plate_no
-        ro_number
-        status
-        v_make_desc
-        v_model_desc
-        v_model_yr
-        v_vin
-        v_color
-    }
-}
-```
-
-### Path with brackets,top level
-
-`"name": "[jobs].joblines.mod_lb_hrs",`
-This will produce a where clause at the `jobs` level of the graphQL query.
-
-```graphql
-query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!) {
-    jobs(
-        where: {date_invoiced: {_is_null: true}, date_open: {_gte: $starttz, _lte: $endtz}, ro_number: {_is_null: false}, voided: {_eq: false}, joblines: {mod_lb_hrs: {_gt: 4}}}
-    ) {
-        joblines(
-            order_by: {line_no: asc}
-            where: {removed: {_eq: false}}
-        ) {
-            line_no
-            mod_lbr_ty
-            mod_lb_hrs
-            convertedtolbr
-            convertedtolbr_data
-        }
-        ownr_co_nm
-        ownr_fn
-        ownr_ln
-        plate_no
-        ro_number
-        status
-        v_make_desc
-        v_model_desc
-        v_model_yr
-        v_vin
-        v_color
-    }
-}
-```
-
-## Known Caveats
-
-- Will only support two level of nesting in the graphQL query `jobs.joblines.mod_lb_hrs` vs `[jobs].joblines.mod_lb_hrs`
-  is fine, but `jobs.[joblines.].some_table.mod_lb_hrs` is not.
-- The type object must be 'string' or 'number'  or 'bool' or 'boolean' or 'date' and is case-sensitive.
-- The `translation` key is used to look up the label in the GUI, if it is not found, the `label` key is used.
-- Do not add the ability to filter things that are already filtered as part of the original query, this would be
-  redundant and could cause issues.
-- Do not add the ability to filter on things like FK constraints, must like the above example.
-- *INHERITANCE CAVEAT* If you have a filters file on a parent report that has a child that you do not want the filters inherited from, you must place a blank filters file (valid json so {}) on the child report level. This will than fetch the child filters, which are empty and move along, versus inheriting the parent filters.
-
-## Sorters
-
-- Sorters follow the same schema as filters, however, they do not do square bracket wrapping to indicate level hoisting,
-  a filter added on `job.md_status` would be added at the top level, and a filter added on `jobs.joblines.mod_lb_hrs`
-  would be added at the `joblines` level.
-- Most of the reports currently do sorting on a template level, this will need to change to actually see the results
-  using the sorters.
-
-### Default Sorters
-
-- A sorter can be given a default object containing a `order` and `direction` key value. This will be used to sort the report if the user does not select any of the sorters themselves.
-- The `order` key is the order in which the sorters are applied, and the `direction` key is the direction of the sort, either `asc` or `desc`.
-
-```json
-{
-    "name": "jobs.joblines.mod_lb_hrs",
-    "translation": "jobs.joblines.mod_lb_hrs_1",
-    "label": "mod_lb_hrs_1",
-    "type": "number",
-    "default": {
-        "order": 1,
-        "direction": "asc"
-    }
-}
-```

client/.env.development

@@ -8,6 +8,6 @@ REACT_APP_CLOUDINARY_API_KEY=957865933348715
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
+REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
 REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/.env.production

@@ -1,4 +1,3 @@
-GENERATE_SOURCEMAP=true
 REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
 REACT_APP_GA_CODE=231103507

client/.gitignore

@@ -1,3 +0,0 @@
-
-# Sentry Config File
-.sentryclirc

client/craco.config.js

@@ -1,54 +1,22 @@
 // craco.config.js
 const TerserPlugin = require("terser-webpack-plugin");
-const CracoLessPlugin = require("craco-less");
+const SentryWebpackPlugin = require("@sentry/webpack-plugin");
-//const SentryWebpackPlugin = require("@sentry/webpack-plugin");
 
 module.exports = {
   plugins: [
-    // {
-    //   plugin: SentryWebpackPlugin,
-    //   options: {
-    //     // sentry-cli configuration
-    //     authToken:
-    //       "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
-    //     org: "snapt-software",
-    //     project: "imexonline",
-    //     release: process.env.REACT_APP_GIT_SHA,
-
-    //     // webpack-specific configuration
-    //     include: ".",
-    //     ignore: ["node_modules", "webpack.config.js"],
-    //   },
-    // },
     {
-      plugin: CracoLessPlugin,
+      plugin: SentryWebpackPlugin,
       options: {
-        lessLoaderOptions: {
+        // sentry-cli configuration
-          lessOptions: {
+        authToken:
-            modifyVars: {
+          "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
-              ...(process.env.NODE_ENV === "development"
+        org: "snapt-software",
-                ? { "@primary-color": "#a51d1d" }
+        project: "imexonline",
-                : {
+        release: process.env.REACT_APP_GIT_SHA,
-                    //"@primary-color": "#1DA57A"
+
-                  }),
+        // webpack-specific configuration
-              // "@primary-color": " #1890ff", // primary color for all components
+        include: ".",
-              // "@link-color": "#1890ff", // link color
+        ignore: ["node_modules", "webpack.config.js"],
-              // "@success-color": "#52c41a", // success state color
-              // "@warning-color": "#faad14", // warning state color
-              // "@error-color": "#f5222d", // error state color
-              // "@font-size-base": "14px", // major text font size
-              // " @heading-color": "rgba(0, 0, 0, 0.85)", // heading text color
-              // "@text-color": "rgba(0, 0, 0, 0.65)", // major text color
-              // "@text-color-secondary": "rgba(0, 0, 0, 0.45)", // secondary text color
-              // "@disabled-color": "rgba(0, 0, 0, 0.25)", // disable state color
-              // "@border-radius-base": "2px", // major border radius
-              // "@border-color-base": "#d9d9d9", // major border color
-              // "@box-shadow-base":
-              //   "0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),0 9px 28px 8px rgba(0, 0, 0, 0.05); // major shadow for layers }",
-            },
-            javascriptEnabled: true,
-          },
-        },
       },
     },
   ],

client/package.json

@@ -4,75 +4,67 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.7.9",
+    "@ant-design/pro-layout": "^7.6.1",
+    "@apollo/client": "^3.6.9",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^7.0.0",
-    "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@jsreport/browser-client": "^3.1.0",
-    "@sentry/cli": "^2.27.0",
+    "@sentry/react": "^7.28.1",
-    "@sentry/react": "^7.99.0",
+    "@sentry/tracing": "^7.28.1",
-    "@sentry/tracing": "^7.40.0",
+    "@splitsoftware/splitio-react": "^1.6.0",
-    "@splitsoftware/splitio-react": "^1.8.1",
     "@tanem/react-nprogress": "^5.0.8",
-    "antd": "^4.24.8",
+    "antd": "5.1.5",
-    "apollo-link-logger": "^2.0.1",
+    "apollo-link-logger": "^2.0.0",
-    "apollo-link-sentry": "^3.3.0",
+    "axios": "^1.2.3",
-    "axios": "^1.3.4",
-    "craco-less": "^2.0.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.0.1",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.17.1",
+    "firebase": "^9.9.1",
-    "graphql": "^16.6.0",
+    "graphql": "^16.5.0",
-    "i18next": "^22.4.10",
+    "i18next": "^22.4.6",
     "i18next-browser-languagedetector": "^7.0.1",
-    "jsoneditor": "^9.9.0",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.10.21",
+    "libphonenumber-js": "^1.10.9",
     "logrocket": "^3.0.1",
-    "markerjs2": "^2.28.1",
+    "markerjs2": "^2.22.0",
     "moment-business-days": "^1.2.0",
-    "moment-timezone": "^0.5.41",
+    "moment-timezone": "^0.5.34",
     "normalize-url": "^8.0.0",
-    "phone": "^3.1.35",
+    "phone": "^3.1.32",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^7.1.3",
+    "query-string": "^8.1.0",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
-    "react-big-calendar": "^1.6.8",
+    "react-big-calendar": "^1.5.2",
     "react-color": "^2.19.3",
-    "react-cookie": "^4.1.1",
+    "react-dom": "^18.2.0",
-    "react-dom": "^17.0.2",
+    "react-drag-listview": "^2.0.0",
-    "react-drag-listview": "^0.2.1",
     "react-grid-gallery": "^1.0.0",
     "react-grid-layout": "^1.3.4",
-    "react-i18next": "^12.2.0",
+    "react-i18next": "^12.1.1",
     "react-icons": "^4.7.1",
     "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.4.3",
+    "react-number-format": "^5.1.2",
-    "react-number-format": "^5.1.3",
     "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",
     "react-router-dom": "^5.3.0",
     "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
-    "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.4.3",
+    "recharts": "^2.1.12",
-    "redux": "^4.2.1",
+    "redux": "^4.2.0",
     "redux-persist": "^6.0.0",
-    "redux-saga": "^1.2.2",
+    "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.4",
-    "reselect": "^4.1.7",
+    "reselect": "^4.1.6",
-    "sass": "^1.58.3",
+    "sass": "^1.54.0",
-    "socket.io-client": "^4.6.1",
+    "socket.io-client": "^4.5.1",
-    "styled-components": "^5.3.6",
+    "styled-components": "^5.3.5",
     "subscriptions-transport-ws": "^0.11.0",
-    "web-vitals": "^2.1.4",
+    "web-vitals": "^3.1.0",
     "workbox-background-sync": "^6.5.3",
     "workbox-broadcast-update": "^6.5.3",
     "workbox-cacheable-response": "^6.5.3",
@@ -84,20 +76,19 @@
     "workbox-range-requests": "^6.5.3",
     "workbox-routing": "^6.5.3",
     "workbox-strategies": "^6.5.3",
-    "workbox-streams": "^6.5.3",
+    "workbox-streams": "^6.5.3"
-    "yauzl": "^2.10.0"
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
-    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build && npm run sentry:sourcemaps",
+    "startrs": "react-scripts start",
-    "build:test": "env-cmd -f .env.test npm run build",
+    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
-    "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
+    "build:test": "env-cmd -f .env.test yarn run build",
+    "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
     "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "test": "cypress open",
     "eject": "react-scripts eject",
-    "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
+    "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ."
-    "sentry:sourcemaps": "sentry-cli sourcemaps inject --org imex --project imexonline ./build && sentry-cli sourcemaps upload --org imex --project imexonline ./build"
   },
   "eslintConfig": {
     "extends": [
@@ -123,8 +114,8 @@
   },
   "devDependencies": {
     "@sentry/webpack-plugin": "^1.20.0",
-    "@testing-library/cypress": "^8.0.3",
+    "@testing-library/cypress": "^9.0.0",
-    "cypress": "^10.3.1",
+    "cypress": "^12.3.0",
     "eslint-plugin-cypress": "^2.12.1",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",

client/src/App/App.container.jsx

@@ -8,7 +8,6 @@ import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
 import client from "../utils/GraphQLClient";
 import App from "./App";
-import * as Sentry from "@sentry/react";
 
 moment.locale("en-US");
 
@@ -19,7 +18,7 @@ export const factory = SplitSdk({
   },
 });
 
-function AppContainer() {
+export default function AppContainer() {
   const { t } = useTranslation();
 
   return (
@@ -43,5 +42,3 @@ function AppContainer() {
     </ApolloProvider>
   );
 }
-
-export default Sentry.withProfiler(AppContainer);

client/src/App/App.jsx

@@ -22,7 +22,6 @@ import {
 } from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
-import handleBeta from "../utils/handleBeta";
 
 const ResetPassword = lazy(() =>
   import("../pages/reset-password/reset-password.component")
@@ -58,6 +57,7 @@ export function App({
     if (!navigator.onLine) {
       setOnline(false);
     }
+
     checkUserSession();
   }, [checkUserSession, setOnline]);
 
@@ -73,7 +73,6 @@ export function App({
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
-
   useEffect(() => {
     if (currentUser.authorized && bodyshop) {
       client.setAttribute("imexshopid", bodyshop.imexshopid);
@@ -108,8 +107,6 @@ export function App({
       />
     );
 
-  handleBeta();
-
   return (
     <Switch>
       <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>

client/src/App/App.styles.scss

@@ -143,28 +143,13 @@
   }
 }
 
-//Update row highlighting on production board.
+
+//Update row highlighting on production board. 
 .ant-table-tbody > tr.ant-table-row:hover > td {
-  background: #e7f3ff !important;
+  background: #eaeaea !important;
 }
 
-.ant-table-tbody > tr.ant-table-row-selected > td {
+.job-line-manual{
-  background: #e6f7ff !important;
-}
-
-.job-line-manual {
   color: tomato;
   font-style: italic;
 }
-
-td.ant-table-column-sort {
-  background-color: transparent;
-}
-
-.ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
-  background-color: #f4f4f4;
-}
-
-.rowWithColor > td {
-  background-color: var(--bgColor) !important;
-}

client/src/components/_test/paymentMethod.jsx

@@ -0,0 +1,49 @@
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { setEmailOptions } from "../../redux/email/email.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
+});
+
+function Test({ bodyshop, setEmailOptions }) {
+  return (
+    <div>
+      <button
+        onClick={() => {
+          setEmailOptions({
+            messageOptions: {
+              to: ["patrickwf@gmail.com"],
+              replyTo: bodyshop.email,
+            },
+            template: {
+              name: TemplateList().parts_order.key,
+              variables: {
+                id: "a7c2d4e1-f519-42a9-a071-c48cf0f22979",
+              },
+            },
+          });
+        }}
+      >
+        send email
+      </button>
+      <button
+        onClick={() => {
+          logImEXEvent("IMEXEVENT", { somethignArThare: 5 });
+        }}
+      >
+        Log an ImEX Event.
+      </button>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Test);

client/src/components/_test/payment_response.json

@@ -1,63 +0,0 @@
-{
-  "status": 24201299,
-  "custid": 19607899,
-  "paymentid": 24201299,
-  "response": "A",
-  "authcode": "498680",
-  "declinereason": "Approved",
-  "fee": 0,
-  "invoice": "",
-  "account": "john",
-  "amount": 1000,
-  "amountincludesfee": false,
-  "total": 1000,
-  "paymenttype": "C",
-  "methodhint": "VI ***1111",
-  "cardbrand": "Visa",
-  "cardnumdisplay": "***1111",
-  "receiptelements": {
-    "authcode": "498680",
-    "cust_srv_ph_num": "1-555-555-5555",
-    "rcpt_pg_ftr_txt": "Thank You\nPlease Come Again",
-    "rcpt_currency": "USD",
-    "responsecode": "A",
-    "rcpt_pay_mthd": "Visa",
-    "transid": "C00 915799",
-    "merch_disp_nm": "CP Devel Test",
-    "rcpt_input_mthd": "Keyed",
-    "rcpt_pg_hdr_txt": "Welcome!",
-    "rcpt_tran_time": "Thursday February 23 2023, 11:25:36 pm +08",
-    "rcpt_trans_type": "Normal Transaction (Sale)",
-    "message": "Approved",
-    "rcpt_dba_addr": "1234 Storefront Ave\nSome City, UT 84111",
-    "avsdata": "N",
-    "receiptrequirements": "S",
-    "rcpt_cardnum": "************1111",
-    "cv2result": "M",
-    "rfnd_policy_txt": "<b>No Refunds</b>\nStore Credit Only",
-    "labels": {
-      "tranref": "REF#",
-      "tid": "TID",
-      "validationcode": "ValCode",
-      "emvapplicationid": "AID",
-      "emvatc": "ATC",
-      "rcpt_pay_mthd": "Pay Method",
-      "transid": "TransID",
-      "rcpt_input_mthd": "IMode",
-      "emvtsi": "TSI",
-      "emvac": "AC",
-      "rcpt_trans_type": "TranType",
-      "emvapplicationname": "PApp",
-      "visarewards": "RewardsProg"
-    }
-  },
-  "receipttoken": "H4sIAAAAAAAAACXMTQuCMBgA4P/ynh3tw_3dBI/ipQ8NOtRN53QiblpBRfTfCzo/8LwhxGAdZCCwFYoJJFQjI2kvHdGu74lVkgmrWyWNhASW5jW7cB87yHjKKePGJODnxrrnMl7dDTKmEJlSOqV/_N30XPpyj2Eddq57_KKZ8FLzmh_G1VQnVfhjiXGK1XYTc/h8AVOkf4qUAAAA",
-  "call": "card_payment",
-  "nonce": "488b5568-b5c1-4f38-8b2f-3b050f3abb11P",
-  "hmac": "JyPAJ9Yx0SlYBTtqns1OxAFRt+xF3l2UiLPO5zTDRBE=",
-  "paymentreferenceid": "C19607899P24201299",
-  "cardnum": "...1111",
-  "email": "",
-  "nameOnCard": "John Allen",
-  "cardType": "visa"
-}

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

@@ -0,0 +1,9 @@
+import React from "react";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+export default function Test() {
+  return (
+    <div>
+      <QboAuthorizeComponent />
+    </div>
+  );
+}

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

@@ -1,31 +0,0 @@
-import { Button } from "antd";
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
-
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = (dispatch) => ({
-  setRefundPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "refund_payment" })),
-});
-
-function Test({ setRefundPaymentContext, refundPaymentModal }) {
-  console.log("refundPaymentModal", refundPaymentModal);
-  return (
-    <div>
-      <Button
-        onClick={() =>
-          setRefundPaymentContext({
-            context: {},
-          })
-        }
-      >
-        Open Modal
-      </Button>
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Test);

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,21 +1,20 @@
-import { Card, Checkbox, Input, Space, Table } from "antd";
+import { Input, Table, Checkbox, Card, Space } from "antd";
-import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
 import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { DateFormatter } from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
 import PayableExportButton from "../payable-export-button/payable-export-button.component";
-import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
+import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import queryString from "query-string";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -138,6 +137,7 @@ export function AccountingPayablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
+
       render: (text, record) => (
         <ExportLogsCountDisplay logs={record.exportlogs} />
       ),
@@ -146,6 +146,8 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
+      sorter: (a, b) => a.clm_total - b.clm_total,
+
       render: (text, record) => (
         <PayableExportButton
           billId={record.id}
@@ -208,7 +210,7 @@ export function AccountingPayablesTableComponent({
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top", pageSize: pageLimit }}
+        pagination={{ position: "top", pageSize: 50 }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -8,12 +8,9 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay, {
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
@@ -77,11 +74,7 @@ export function AccountingPayablesTableComponent({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) =>
+      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-        alphaSort(
-          OwnerNameDisplayFunction(a.job),
-          OwnerNameDisplayFunction(b.job)
-        ),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -100,9 +93,6 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.amount"),
       dataIndex: "amount",
       key: "amount",
-      sorter: (a, b) => a.amount - b.amount,
-      sortOrder:
-        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,
       render: (text, record) => (
         <CurrencyFormatter>{record.amount}</CurrencyFormatter>
       ),
@@ -121,21 +111,18 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",
       key: "created_at",
-      sorter: (a, b) => dateSort(a.created_at, b.created_at),
-      sortOrder:
-        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
       render: (text, record) => (
         <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
       ),
     },
-    // {
+    {
-    //   title: t("payments.fields.exportedat"),
+      title: t("payments.fields.exportedat"),
-    //   dataIndex: "exportedat",
+      dataIndex: "exportedat",
-    //   key: "exportedat",
+      key: "exportedat",
-    //   render: (text, record) => (
+      render: (text, record) => (
-    //     <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+        <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-    //   ),
+      ),
-    // },
+    },
     {
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
@@ -149,6 +136,8 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
+      sorter: (a, b) => a.clm_total - b.clm_total,
+
       render: (text, record) => (
         <PaymentExportButton
           paymentId={record.id}
@@ -220,7 +209,7 @@ export function AccountingPayablesTableComponent({
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top", pageSize: pageLimit }}
+        pagination={{ position: "top", pageSize: 50 }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -4,19 +4,17 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { DateFormatter } from "../../utils/DateFormatter";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { DateFormatter } from "../../utils/DateFormatter";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -65,7 +63,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
+      sorter: (a, b) => a.status - b.status,
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
@@ -85,8 +83,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-      sorter: (a, b) =>
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -106,15 +103,6 @@ export function AccountingReceivablesTableComponent({
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
-            a.v_model_desc || ""
-          }`,
-          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => {
         return record.vehicleid ? (
           <Link to={"/manage/vehicles/" + record.vehicleid}>

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

@@ -61,7 +61,7 @@ export function AllocationsAssignmentComponent({
   );
 
   return (
-    <Popover content={popContent} visible={visibility}>
+    <Popover content={popContent} open={visibility}>
       <Button onClick={() => setVisibility(true)}>
         {t("allocations.actions.assign")}
       </Button>

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

@@ -59,7 +59,7 @@ export default connect(
   );
 
   return (
-    <Popover content={popContent} visible={visibility}>
+    <Popover content={popContent} open={visibility}>
       <Button disabled={disabled} onClick={() => setVisibility(true)}>
         {t("allocations.actions.assign")}
       </Button>

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

@@ -4,7 +4,6 @@ import { alphaSort } from "../../utils/sorters";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { useTranslation } from "react-i18next";
 import AuditTrailValuesComponent from "../audit-trail-values/audit-trail-values.component";
-import {pageLimit} from "../../utils/config";
 
 export default function AuditTrailListComponent({ loading, data }) {
   const [state, setState] = useState({
@@ -75,7 +74,7 @@ export default function AuditTrailListComponent({ loading, data }) {
     <Table
       {...formItemLayout}
       loading={loading}
-      pagination={{ position: "top", defaultPageSize: pageLimit }}
+      pagination={{ position: "top", defaultPageSize: 25 }}
       columns={columns}
       rowKey="id"
       dataSource={data}

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

@@ -3,7 +3,6 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
-import {pageLimit} from "../../utils/config";
 
 export default function EmailAuditTrailListComponent({ loading, data }) {
   const [state, setState] = useState({
@@ -54,7 +53,7 @@ export default function EmailAuditTrailListComponent({ loading, data }) {
     <Table
       {...formItemLayout}
       loading={loading}
-      pagination={{ position: "top", defaultPageSize: pageLimit }}
+      pagination={{ position: "top", defaultPageSize: 25 }}
       columns={columns}
       rowKey="id"
       dataSource={data}

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

@@ -3,22 +3,10 @@ import { useMutation } from "@apollo/client";
 import { Button, notification, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
 import { DELETE_BILL } from "../../graphql/bills.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
-const mapStateToProps = createStructuredSelector({});
+export default function BillDeleteButton({ bill }) {
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(BillDeleteButton);
-
-export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -48,13 +36,6 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
 
     if (!!!result.errors) {
       notification["success"]({ message: t("bills.successes.deleted") });
-      insertAuditTrail({
-        jobid: jobid,
-        operation: AuditTrailMapping.billdeleted(bill.invoice_number),
-        type: "billdeleted",
-      });
-
-      if (callback && typeof callback === "function") callback(bill.id);
     } else {
       //Check if it's an fkey violation.
       const error = JSON.stringify(result.errors);

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

@@ -1,5 +1,6 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Divider, Form, PageHeader, Popconfirm, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Popconfirm, Space } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useState } from "react";
@@ -10,7 +11,7 @@ import { createStructuredSelector } from "reselect";
 import {
   DELETE_BILL_LINE,
   INSERT_NEW_BILL_LINES,
-  UPDATE_BILL_LINE,
+  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";
@@ -20,7 +21,6 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
-import BillPrintButton from "../bill-print-button/bill-print-button.component";
 import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
 import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
 import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
@@ -33,8 +33,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation, type }) =>
+  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(
@@ -150,7 +150,6 @@ export function BillDetailEditcontainer({
       jobid: bill.jobid,
       billid: search.billid,
       operation: AuditTrailMapping.billupdated(bill.invoice_number),
-      type: "billupdated",
     });
 
     await refetch();
@@ -164,7 +163,6 @@ export function BillDetailEditcontainer({
   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;
 
   return (
     <>
@@ -179,9 +177,9 @@ export function BillDetailEditcontainer({
             extra={
               <Space>
                 <BillDetailEditReturn data={data} />
-                <BillPrintButton billid={search.billid} />
+
                 <Popconfirm
-                  visible={visible}
+                  open={visible}
                   onConfirm={() => form.submit()}
                   onCancel={() => setVisible(false)}
                   okButtonProps={{ loading: updateLoading }}
@@ -208,8 +206,8 @@ export function BillDetailEditcontainer({
             initialValues={transformData(data)}
             layout="vertical"
           >
-            <BillFormContainer form={form} billEdit disabled={exported} disableInHouse={isinhouse}/>
+            <BillFormContainer form={form} billEdit disabled={exported} />
-            <Divider orientation="left">{t("general.labels.media")}</Divider>
+
             {bodyshop.uselocalmediaserver ? (
               <JobsDocumentsLocalGallery
                 job={{ id: data ? data.bills_by_pk.jobid : null }}

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

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation, type }) =>
+  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(
@@ -45,7 +45,6 @@ export function BillDetailEditReturn({
       actions: {},
       context: {
         jobId: data.bills_by_pk.jobid,
-        job: data.bills_by_pk.job,
         vendorId: data.bills_by_pk.vendorid,
         returnFromBill: data.bills_by_pk.id,
         invoiceNumber: data.bills_by_pk.invoice_number,
@@ -78,7 +77,7 @@ export function BillDetailEditReturn({
   return (
     <>
       <Modal
-        visible={visible}
+        open={visible}
         onCancel={() => setVisible(false)}
         destroyOnClose
         title={t("bills.actions.return")}
@@ -174,11 +173,7 @@ export function BillDetailEditReturn({
         </Form>
       </Modal>
       <Button
-        disabled={
+        disabled={data.bills_by_pk.is_credit_memo || disabled}
-          data.bills_by_pk.is_credit_memo ||
-          data.bills_by_pk.isinhouse ||
-          disabled
-        }
         onClick={() => {
           setVisible(true);
         }}

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

@@ -32,7 +32,7 @@ export default function BillDetailEditcontainer() {
         history.push({ search: queryString.stringify(search) });
       }}
       destroyOnClose
-      visible={search.billid}
+      open={search.billid}
     >
       <BillDetailEditComponent />
     </Drawer>

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

@@ -1,18 +1,18 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
+import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
 import _ from "lodash";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useState, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
-import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
 import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
+import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
@@ -20,15 +20,15 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
 import confirmDialog from "../../utils/asyncConfirm";
-import useLocalStorage from "../../utils/useLocalStorage";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
-import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
+import useLocalStorage from "../../utils/useLocalStorage";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, billid, operation, type }) =>
+  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, billid, operation, type })),
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 const Templates = TemplateList("job_special");
@@ -94,7 +94,6 @@ function BillEnterModalContainer({
       location,
       outstanding_returns,
       inventory,
-      federal_tax_exempt,
       ...remainingValues
     } = values;
 
@@ -127,24 +126,13 @@ function BillEnterModalContainer({
                     deductedfromlbr: deductedfromlbr,
                     lbr_adjustment,
                     joblineid: i.joblineid === "noline" ? null : i.joblineid,
-                    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,
-                    },
                   };
                 }),
             },
           },
         ],
       },
-      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
 
     const adjKeys = Object.keys(adjustmentsToInsert);
@@ -171,7 +159,6 @@ function BillEnterModalContainer({
             mod_lbr_ty: key,
             hours: adjustmentsToInsert[key].toFixed(1),
           }),
-          type: "jobmodifylbradj",
         });
       });
 
@@ -318,10 +305,7 @@ function BillEnterModalContainer({
     insertAuditTrail({
       jobid: values.jobid,
       billid: billId,
-      operation: AuditTrailMapping.billposted(
+      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
-        r1.data.insert_bills.returning[0].invoice_number
-      ),
-      type: "billposted",
     });
 
     if (enterAgain) {
@@ -360,7 +344,7 @@ function BillEnterModalContainer({
     <Modal
       title={t("bills.labels.new")}
       width={"98%"}
-      visible={billEnterModal.visible}
+      open={billEnterModal.visible}
       okText={t("general.actions.save")}
       keyboard="false"
       onOk={() => form.submit()}

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

@@ -1,6 +1,6 @@
 import Icon, { UploadOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import { MdOpenInNew } from "react-icons/md";
 import {
   Alert,
   Divider,
@@ -12,17 +12,14 @@ import {
   Switch,
   Upload,
 } from "antd";
-import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
-import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -31,6 +28,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -47,11 +46,9 @@ export function BillFormComponent({
   loadLines,
   billEdit,
   disableInvNumber,
-  disableInHouse,
   job,
   loadOutstandingReturns,
   loadInventory,
-  preferredMake,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -61,11 +58,6 @@ export function BillFormComponent({
     {},
     bodyshop.imexshopid
   );
-  const { ClosingPeriod } = useTreatments(
-    ["ClosingPeriod"],
-    {},
-    bodyshop.imexshopid
-  );
 
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
@@ -80,20 +72,6 @@ export function BillFormComponent({
       });
   };
 
-  const handleFederalTaxExemptSwitchToggle = (checked) => {
-    // Early gate
-    if (!checked) return;
-    const values = form.getFieldsValue("billlines");
-    // Gate bill lines
-    if (!values?.billlines?.length) return;
-
-    const billlines = values.billlines.map((b) => {
-      b.applicable_taxes.federal = false;
-      return b;
-    });
-    form.setFieldsValue({ billlines });
-  };
-
   useEffect(() => {
     if (job) form.validateFields(["is_credit_memo"]);
   }, [job, form]);
@@ -199,9 +177,8 @@ export function BillFormComponent({
           ]}
         >
           <VendorSearchSelect
-            disabled={disabled || disableInHouse}
+            disabled={disabled}
             options={vendorAutoCompleteOptions}
-            preferredMake={preferredMake}
             onSelect={handleVendorSelect}
           />
         </Form.Item>
@@ -272,7 +249,7 @@ export function BillFormComponent({
             }),
           ]}
         >
-          <Input disabled={disabled || disableInvNumber || disableInHouse} />
+          <Input disabled={disabled || disableInvNumber} />
         </Form.Item>
         <Form.Item
           label={t("bills.fields.date")}
@@ -282,37 +259,6 @@ export function BillFormComponent({
               required: true,
               //message: t("general.validation.required"),
             },
-            ({ getFieldValue }) => ({
-              validator(rule, value) {
-                if (
-                  ClosingPeriod.treatment === "on" &&
-                  bodyshop.accountingconfig.ClosingPeriod
-                ) {
-                  if (
-                    moment(value)
-                      .startOf("day")
-                      .isSameOrAfter(
-                        moment(
-                          bodyshop.accountingconfig.ClosingPeriod[0]
-                        ).startOf("day")
-                      ) &&
-                    moment(value)
-                      .startOf("day")
-                      .isSameOrBefore(
-                        moment(
-                          bodyshop.accountingconfig.ClosingPeriod[1]
-                        ).endOf("day")
-                      )
-                  ) {
-                    return Promise.resolve();
-                  } else {
-                    return Promise.reject(t("bills.validation.closingperiod"));
-                  }
-                } else {
-                  return Promise.resolve();
-                }
-              },
-            }),
           ]}
         >
           <FormDatePicker disabled={disabled} />
@@ -402,16 +348,7 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} />
         </Form.Item>
-        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+        <Form.Item shouldUpdate span={15}>
-          <Form.Item
-            span={2}
-            label={t("bills.labels.federal_tax_exempt")}
-            name="federal_tax_exempt"
-          >
-            <Switch onChange={handleFederalTaxExemptSwitchToggle} />
-          </Form.Item>
-        ) : null}
-        <Form.Item shouldUpdate span={13}>
           {() => {
             const values = form.getFieldsValue([
               "billlines",
@@ -429,7 +366,7 @@ export function BillFormComponent({
               totals = CalculateBillTotal(values);
             if (!!totals)
               return (
-                <div align="right">
+                <div>
                   <Space wrap>
                     <Statistic
                       title={t("bills.labels.subtotal")}
@@ -505,11 +442,10 @@ export function BillFormComponent({
           billEdit={billEdit}
         />
       )}
-      <Divider orientation="left" style={{ display: billEdit ? "none" : null }}>
+
-        {t("documents.labels.upload")}
-      </Divider>
       <Form.Item
         name="upload"
+        label="Upload"
         style={{ display: billEdit ? "none" : null }}
         valuePropName="fileList"
         getValueFromEvent={(e) => {

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

@@ -1,16 +1,16 @@
 import { useLazyQuery, useQuery } from "@apollo/client";
-import { useTreatments } 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";
 import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
-import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
-import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
 import BillFormComponent from "./bill-form.component";
+import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
+import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
+import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
+import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,7 +22,6 @@ export function BillFormContainer({
   billEdit,
   disabled,
   disableInvNumber,
-  disableInHouse
 }) {
   const { Simple_Inventory } = useTreatments(
     ["Simple_Inventory"],
@@ -58,10 +57,8 @@ export function BillFormContainer({
         job={lineData ? lineData.jobs_by_pk : null}
         responsibilityCenters={bodyshop.md_responsibility_centers || null}
         disableInvNumber={disableInvNumber}
-        disableInHouse={disableInHouse}
         loadOutstandingReturns={loadOutstandingReturns}
         loadInventory={loadInventory}
-        preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
       />
       {!billEdit && (
         <BillCmdReturnsTableComponent

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

@@ -1,15 +1,14 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button,
+  Button, Form,
-  Form,
   Input,
   InputNumber,
   Select,
   Space,
   Switch,
   Table,
-  Tooltip,
+  Tooltip
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -467,8 +466,7 @@ export function BillEnterModalLinesComponent({
           return {
             key: `${field.index}fedtax`,
             valuePropName: "checked",
-            initialValue:
+            initialValue: true,
-              form.getFieldValue("federal_tax_exempt") === true ? false : true,
             name: [field.name, "applicable_taxes", "federal"],
           };
         },

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

@@ -1,38 +0,0 @@
-import { Button, Space } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
-
-export default function BillPrintButton({ billid }) {
-  const { t } = useTranslation();
-  const [loading, setLoading] = useState(false);
-  const Templates = TemplateList("job_special");
-
-  const submitHandler = async () => {
-    setLoading(true);
-    try {
-      await GenerateDocument(
-        {
-          name: Templates.parts_invoice_label_single.key,
-          variables: {
-            id: billid,
-          },
-        },
-        {},
-        "p"
-      );
-    } catch (e) {
-      console.warn("Warning: Error generating a document.");
-    }
-    setLoading(false);
-  };
-
-  return (
-    <Space wrap>
-      <Button loading={loading} onClick={submitHandler}>
-        {t("bills.labels.printlabels")}
-      </Button>
-    </Space>
-  );
-}

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

@@ -9,8 +9,8 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort, dateSort } from "../../utils/sorters";
+import { TemplateList } from "../../utils/TemplateConstants";
 import BillDeleteButton from "../bill-delete-button/bill-delete-button.component";
 import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-return.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
@@ -58,9 +58,9 @@ export function BillsListTableComponent({
           <EditFilled />
         </Button>
       )}
-      <BillDeleteButton bill={record} jobid={job.id} />
+      <BillDeleteButton bill={record} />
       <BillDetailEditReturnComponent
-        data={{ bills_by_pk: { ...record, jobid: job.id, job: job } }}
+        data={{ bills_by_pk: { ...record, jobid: job.id } }}
         disabled={
           record.is_credit_memo ||
           record.vendorid === bodyshop.inhousevendorid ||

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

@@ -7,9 +7,7 @@ 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";
 import "./breadcrumbs.styles.scss";
-import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   breadcrumbs: selectBreadcrumbs,
@@ -17,12 +15,6 @@ const mapStateToProps = createStructuredSelector({
 });
 
 export function BreadCrumbs({ breadcrumbs, bodyshop }) {
-  const { OpenSearch } = useTreatments(
-    ["OpenSearch"],
-    {},
-    bodyshop && bodyshop.imexshopid
-  );
-
   return (
     <Row className="breadcrumb-container">
       <Col xs={24} sm={24} md={16}>
@@ -46,7 +38,7 @@ export function BreadCrumbs({ breadcrumbs, bodyshop }) {
         </Breadcrumb>
       </Col>
       <Col xs={24} sm={24} md={8}>
-        {OpenSearch.treatment === "on" ? <GlobalSearchOs /> : <GlobalSearch />}
+        <GlobalSearch />
       </Col>
     </Row>
   );

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

@@ -70,7 +70,7 @@ export function ContractsFindModalContainer({
 
   return (
     <Modal
-      visible={visible}
+      open={visible}
       width="70%"
       title={t("payments.labels.findermodal")}
       onCancel={() => toggleModalVisible()}

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

@@ -1,8 +1,8 @@
-import { CalculatorFilled } from "@ant-design/icons";
-import { Button, Form, InputNumber, Popover, Space } from "antd";
 import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import { Button, Form, InputNumber, Popover } from "antd";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { useTranslation } from "react-i18next";
+import { CalculatorFilled } from "@ant-design/icons";
 export default function CABCpvrtCalculator({ disabled, form }) {
   const [visibility, setVisibility] = useState(false);
 
@@ -10,10 +10,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
 
   const handleFinish = async (values) => {
     logImEXEvent("job_ca_bc_pvrt_calculate");
-    form.setFieldsValue({
+    form.setFieldsValue({ ca_bc_pvrt: ((values.rate||0) * (values.days||0)).toFixed(2) });
-      ca_bc_pvrt: ((values.rate || 0) * (values.days || 0)).toFixed(2),
-    });
-    form.setFields([{ name: "ca_bc_pvrt", touched: true }]);
     setVisibility(false);
   };
 
@@ -26,14 +23,10 @@ export default function CABCpvrtCalculator({ disabled, form }) {
         <Form.Item name="days" label={t("jobs.labels.ca_bc_pvrt.days")}>
           <InputNumber precision={0} min={0} />
         </Form.Item>
-        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+        <Button type="primary" htmlType="submit">
-          <Space>
+          {t("general.actions.calculate")}
-            <Button type="primary" htmlType="submit">
+        </Button>
-              {t("general.actions.calculate")}
+        <Button onClick={() => setVisibility(false)}>Close</Button>
-            </Button>
-            <Button onClick={() => setVisibility(false)}>Close</Button>
-          </Space>
-        </div>
       </Form>
     </div>
   );
@@ -42,7 +35,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
     <Popover
       destroyTooltipOnHide
       content={popContent}
-      visible={visibility}
+      open={visibility}
       disabled={disabled}
     >
       <Button disabled={disabled} onClick={() => setVisibility(true)}>

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

@@ -1,328 +0,0 @@
-import { DeleteFilled } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
-import {
-  Button,
-  Card,
-  Col,
-  Form,
-  Input,
-  Row,
-  Space,
-  Spin,
-  Statistic,
-  notification,
-} from "antd";
-import axios from "axios";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  INSERT_PAYMENT_RESPONSE,
-  QUERY_RO_AND_OWNER_BY_JOB_PKS,
-} from "../../graphql/payment_response.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { toggleModalVisible } from "../../redux/modals/modals.actions";
-import { selectCardPayment } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-
-const mapStateToProps = createStructuredSelector({
-  cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
-  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
-});
-
-const CardPaymentModalComponent = ({
-  bodyshop,
-  cardPaymentModal,
-  toggleModalVisible,
-  insertAuditTrail,
-}) => {
-  const { context, actions } = cardPaymentModal;
-
-  const [form] = Form.useForm();
-
-  const [loading, setLoading] = useState(false);
-  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
-  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
-  const { t } = useTranslation();
-
-  const [, { data, refetch, queryLoading }] = useLazyQuery(
-    QUERY_RO_AND_OWNER_BY_JOB_PKS,
-    {
-      variables: { jobids: [context.jobid] },
-      skip: true,
-    }
-  );
-
-  //Initialize the intellipay window.
-  const SetIntellipayCallbackFunctions = () => {
-    console.log("*** Set IntelliPay callback functions.");
-    window.intellipay.runOnClose(() => {
-      //window.intellipay.initialize();
-    });
-
-    window.intellipay.runOnApproval(async function (response) {
-      //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
-      //Add a slight delay to allow the refetch to properly get the data.
-      setTimeout(() => {
-        if (actions && actions.refetch && typeof actions.refetch === "function")
-          actions.refetch();
-        setLoading(false);
-        toggleModalVisible();
-      }, 750);
-    });
-
-    window.intellipay.runOnNonApproval(async function (response) {
-      // Mutate unsuccessful payment
-
-      const { payments } = form.getFieldsValue();
-      await insertPaymentResponse({
-        variables: {
-          paymentResponse: payments.map((payment) => ({
-            amount: payment.amount,
-            bodyshopid: bodyshop.id,
-            jobid: payment.jobid,
-            declinereason: response.declinereason,
-            ext_paymentid: response.paymentid.toString(),
-            successful: false,
-            response,
-          })),
-        },
-      });
-
-      payments.forEach((payment) =>
-        insertAuditTrail({
-          jobid: payment.jobid,
-          operation: AuditTrailMapping.failedpayment(),
-          type: "failedpayment",
-        })
-      );
-    });
-  };
-
-
-  const handleIntelliPayCharge = async () => {
-    setLoading(true);
-    //Validate
-    try {
-      await form.validateFields();
-    } catch (error) {
-      setLoading(false);
-      return;
-    }
-
-    try {
-      const response = await axios.post("/intellipay/lightbox_credentials", {
-        bodyshop,
-        refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue(),
-      });
-
-      if (window.intellipay) {
-        // eslint-disable-next-line no-eval
-        eval(response.data);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.autoOpen();
-      } else {
-        var rg = document.createRange();
-        let node = rg.createContextualFragment(response.data);
-        document.documentElement.appendChild(node);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.isAutoOpen = true;
-        window.intellipay.initialize();
-      }
-    } catch (error) {
-      notification.open({
-        type: "error",
-        message: t("job_payments.notifications.error.openingip"),
-      });
-      setLoading(false);
-    }
-  };
-
-  return (
-    <Card title="Card Payment">
-      <Spin spinning={loading}>
-        <Form
-          form={form}
-          layout="vertical"
-          initialValues={{
-            payments: context.jobid ? [{ jobid: context.jobid }] : [],
-          }}
-        >
-          <Form.List name={["payments"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item key={field.key}>
-                      <Row gutter={[16, 16]}>
-                        <Col span={16}>
-                          <Form.Item
-                            key={`${index}jobid`}
-                            label={t("jobs.fields.ro_number")}
-                            name={[field.name, "jobid"]}
-                            rules={[
-                              {
-                                required: true,
-                                //message: t("general.validation.required"),
-                              },
-                            ]}
-                          >
-                            <JobSearchSelectComponent
-                              notExported={false}
-                              clm_no
-                            />
-                          </Form.Item>
-                        </Col>
-                        <Col span={6}>
-                          <Form.Item
-                            key={`${index}amount`}
-                            label={t("payments.fields.amount")}
-                            name={[field.name, "amount"]}
-                            rules={[
-                              {
-                                required: true,
-                                //message: t("general.validation.required"),
-                              },
-                            ]}
-                          >
-                            <CurrencyFormItemComponent />
-                          </Form.Item>
-                        </Col>
-                        <Col span={2}>
-                          <DeleteFilled
-                            style={{ margin: "1rem" }}
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
-                        </Col>
-                      </Row>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-
-          <Form.Item
-            shouldUpdate={(prevValues, curValues) =>
-              prevValues.payments?.map((p) => p?.jobid).join() !==
-              curValues.payments?.map((p) => p?.jobid).join()
-            }
-          >
-            {() => {
-              //If all of the job ids have been fileld in, then query and update the IP field.
-              const { payments } = form.getFieldsValue();
-              if (
-                payments?.length > 0 &&
-                payments?.filter((p) => p?.jobid).length === payments?.length
-              ) {
-                refetch({ jobids: payments.map((p) => p.jobid) });
-              }
-              return (
-                <>
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="account"
-                    //type="hidden"
-                    value={
-                      payments && data && data.jobs.length > 0
-                        ? data.jobs.map((j) => j.ro_number).join(", ")
-                        : null
-                    }
-                    hidden
-                  />
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="email"
-                    // type="hidden"
-                    value={
-                      payments && data && data.jobs.length > 0
-                        ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
-                        : null
-                    }
-                    hidden
-                  />
-                </>
-              );
-            }}
-          </Form.Item>
-          <Form.Item
-            shouldUpdate={(prevValues, curValues) =>
-              prevValues.payments?.map((p) => p?.amount).join() !==
-              curValues.payments?.map((p) => p?.amount).join()
-            }
-          >
-            {() => {
-              const { payments } = form.getFieldsValue();
-              const totalAmountToCharge = payments?.reduce((acc, val) => {
-                return acc + (val?.amount || 0);
-              }, 0);
-
-              return (
-                <Space style={{ float: "right" }}>
-                  <Statistic
-                    title="Amount To Charge"
-                    value={totalAmountToCharge}
-                    precision={2}
-                  />
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="amount"
-                    //type="hidden"
-                    value={totalAmountToCharge?.toFixed(2)}
-                    hidden
-                  />
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="comment"
-                    //type="hidden"
-                    value={btoa(JSON.stringify(payments))}
-                    hidden
-                  />
-                  <Button
-                    type="primary"
-                    //  data-ipayname="submit"
-                    className="ipayfield"
-                    loading={queryLoading || loading}
-                    disabled={!(totalAmountToCharge > 0)}
-                    onClick={handleIntelliPayCharge}
-                  >
-                    {t("job_payments.buttons.proceedtopayment")}
-                  </Button>
-                </Space>
-              );
-            }}
-          </Form.Item>
-        </Form>
-      </Spin>
-    </Card>
-  );
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CardPaymentModalComponent);

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

@@ -1,57 +0,0 @@
-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,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
-});
-
-function CardPaymentModalContainer({
-  cardPaymentModal,
-  toggleModalVisible,
-  bodyshop,
-}) {
-  const { visible } = cardPaymentModal;
-  const { t } = useTranslation();
-
-  const handleCancel = () => {
-    toggleModalVisible();
-  };
-
-  const handleOK = () => {
-    toggleModalVisible();
-  };
-
-  return (
-    <Modal
-      open={visible}
-      onOk={handleOK}
-      onCancel={handleCancel}
-      footer={[
-        <Button key="back" onClick={handleCancel}>
-          {t("job_payments.buttons.goback")}
-        </Button>,
-      ]}
-      width="80%"
-      destroyOnClose
-    >
-      <CardPaymentModalComponent />
-    </Modal>
-  );
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CardPaymentModalContainer);

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

@@ -1,19 +1,12 @@
 import { Badge, List, Tag } from "antd";
 import React from "react";
 import { connect } from "react-redux";
-import {
-  AutoSizer,
-  CellMeasurer,
-  CellMeasurerCache,
-  List as VirtualizedList,
-} from "react-virtualized";
 import { createStructuredSelector } from "reselect";
 import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-
 import "./chat-conversation-list.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -25,95 +18,59 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setSelectedConversation(conversationId)),
 });
 
-function ChatConversationListComponent({
+export function ChatConversationListComponent({
   conversationList,
   selectedConversation,
   setSelectedConversation,
-  loadMoreConversations,
 }) {
-  const cache = new CellMeasurerCache({
-    fixedWidth: true,
-    defaultHeight: 60,
-  });
-
-  const rowRenderer = ({ index, key, style, parent }) => {
-    const item = conversationList[index];
-
-    return (
-      <CellMeasurer
-        key={key}
-        cache={cache}
-        parent={parent}
-        columnIndex={0}
-        rowIndex={index}
-      >
-        <List.Item
-          onClick={() => setSelectedConversation(item.id)}
-          className={`chat-list-item ${
-            item.id === selectedConversation
-              ? "chat-list-selected-conversation"
-              : null
-          }`}
-          style={style}
-        >
-          <div
-            style={{
-              display: "inline-block",
-            }}
-          >
-            {item.label && <div className="chat-name">{item.label}</div>}
-            {item.job_conversations.length > 0 ? (
-              <div className="chat-name">
-                {item.job_conversations.map((j, idx) => (
-                  <div key={idx}>
-                    <OwnerNameDisplay ownerObject={j.job} />
-                  </div>
-                ))}
-              </div>
-            ) : (
-              <PhoneFormatter>{item.phone_num}</PhoneFormatter>
-            )}
-          </div>
-          <div style={{ display: "inline-block" }}>
-            <div>
-              {item.job_conversations.length > 0
-                ? item.job_conversations.map((j, idx) => (
-                    <Tag key={idx} className="ro-number-tag">
-                      {j.job.ro_number}
-                    </Tag>
-                  ))
-                : null}
-            </div>
-            <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
-          </div>
-          <Badge count={item.messages_aggregate.aggregate.count || 0} />
-        </List.Item>
-      </CellMeasurer>
-    );
-  };
-
   return (
     <div className="chat-list-container">
-      <AutoSizer>
+      <List
-        {({ height, width }) => (
+        bordered
-          <VirtualizedList
+        dataSource={conversationList}
-            height={height}
+        renderItem={(item) => (
-            width={width}
+          <List.Item
-            rowCount={conversationList.length}
+            key={item.id}
-            rowHeight={cache.rowHeight}
+            onClick={() => setSelectedConversation(item.id)}
-            rowRenderer={rowRenderer}
+            className={`chat-list-item ${
-            onScroll={({ scrollTop, scrollHeight, clientHeight }) => {
+              item.id === selectedConversation
-              if (scrollTop + clientHeight === scrollHeight) {
+                ? "chat-list-selected-conversation"
-                loadMoreConversations();
+                : null
-              }
+            }`}
-            }}
+          >
-          />
+            <div sryle={{ display: "inline-block" }}>
+              {item.label && <div className="chat-name">{item.label}</div>}
+              {item.job_conversations.length > 0 ? (
+                <div className="chat-name">
+                  {item.job_conversations.map((j, idx) => (
+                    <div key={idx}>
+                      <OwnerNameDisplay ownerObject={j.job} />
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <PhoneFormatter>{item.phone_num}</PhoneFormatter>
+              )}
+            </div>
+            <div sryle={{ display: "inline-block" }}>
+              <div>
+                {item.job_conversations.length > 0
+                  ? item.job_conversations.map((j, idx) => (
+                      <Tag key={idx} className="ro-number-tag">
+                        {j.job.ro_number}
+                      </Tag>
+                    ))
+                  : null}
+              </div>
+              <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
+            </div>
+            <Badge count={item.messages_aggregate.aggregate.count || 0} />
+          </List.Item>
         )}
-      </AutoSizer>
+      />
     </div>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -3,9 +3,8 @@
 }
 .chat-list-container {
   flex: 1;
-  overflow: hidden;
+  overflow: auto;
   height: 100%;
-  border: 1px solid gainsboro;
 }
 
 .chat-list-item {
@@ -22,6 +21,4 @@
   .ro-number-tag {
     align-self: baseline;
   }
-  padding: 12px 24px;
-  border-bottom: 1px solid gainsboro;
 }

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

@@ -4,7 +4,6 @@ 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";
 import ChatLabelComponent from "../chat-label/chat-label.component";
-import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
 
 export default function ChatConversationTitle({ conversation }) {
@@ -14,7 +13,6 @@ export default function ChatConversationTitle({ conversation }) {
         {conversation && conversation.phone_num}
       </PhoneNumberFormatter>
       <ChatLabelComponent conversation={conversation} />
-      <ChatPrintButton conversation={conversation} />
       <ChatConversationTitleTags
         jobConversations={
           (conversation && conversation.job_conversations) || []

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

@@ -42,7 +42,6 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
     MARK_MESSAGES_AS_READ_BY_CONVERSATION,
     {
       variables: { conversationId: selectedConversation },
-      refetchQueries: ["UNREAD_CONVERSATION_COUNT"],
       update(cache) {
         cache.modify({
           id: cache.identify({

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

@@ -88,8 +88,8 @@ export function ChatMediaSelector({
       }
       title={t("messaging.labels.selectmedia")}
       trigger="click"
-      visible={visible}
+      open={visible}
-      onVisibleChange={handleVisibleChange}
+      onOpenChange={handleVisibleChange}
     >
       <Badge count={selectedMedia.filter((s) => s.isSelected).length}>
         <PictureFilled style={{ margin: "0 .5rem" }} />

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

@@ -8,23 +8,15 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  searchingForConversation: searchingForConversation,
 });
 
 const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
 });
 
-export function ChatOpenButton({
+export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
-  bodyshop,
-  searchingForConversation,
-  phone,
-  jobid,
-  openChatByPhone,
-}) {
   const { t } = useTranslation();
   if (!phone) return <></>;
 
@@ -37,7 +29,7 @@ export function ChatOpenButton({
       onClick={(e) => {
         e.stopPropagation();
         const p = parsePhoneNumber(phone, "CA");
-        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
+
         if (p && p.isValid()) {
           openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
         } else {

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

@@ -4,16 +4,13 @@ import {
   ShrinkOutlined,
   SyncOutlined,
 } from "@ant-design/icons";
-import { useLazyQuery, useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
+import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
-  CONVERSATION_LIST_QUERY,
-  UNREAD_CONVERSATION_COUNT,
-} from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import {
   selectChatVisible,
@@ -40,21 +37,12 @@ export function ChatPopupComponent({
 }) {
   const { t } = useTranslation();
   const [pollInterval, setpollInterval] = useState(0);
-
+  const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
-  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
-  const [getConversations, { loading, data, refetch, fetchMore }] =
-    useLazyQuery(CONVERSATION_LIST_QUERY, {
-      fetchPolicy: "network-only",
-      nextFetchPolicy: "network-only",
-      skip: !chatVisible,
-      ...(pollInterval > 0 ? { pollInterval } : {}),
-    });
-
   const fcmToken = sessionStorage.getItem("fcmtoken");
 
   useEffect(() => {
@@ -66,24 +54,15 @@ export function ChatPopupComponent({
   }, [fcmToken]);
 
   useEffect(() => {
-    if (chatVisible)
+    if (called && chatVisible) refetch();
-      getConversations({
+  }, [chatVisible, called, refetch]);
-        variables: {
-          offset: 0,
-        },
-      });
-  }, [chatVisible, getConversations]);
 
-  const loadMoreConversations = useCallback(() => {
+  const unreadCount = data
-    if (data)
+    ? data.conversations.reduce(
-      fetchMore({
+        (acc, val) => val.messages_aggregate.aggregate.count + acc,
-        variables: {
+        0
-          offset: data.conversations.length,
+      )
-        },
+    : 0;
-      });
-  }, [data, fetchMore]);
-
-  const unreadCount = unreadData?.messages_aggregate.aggregate.count || 0;
 
   return (
     <Badge count={unreadCount}>
@@ -118,7 +97,6 @@ export function ChatPopupComponent({
                 ) : (
                   <ChatConversationListComponent
                     conversationList={data ? data.conversations : []}
-                    loadMoreConversations={loadMoreConversations}
                   />
                 )}
               </Col>
@@ -132,7 +110,7 @@ export function ChatPopupComponent({
             onClick={() => toggleChatVisible()}
             style={{ cursor: "pointer" }}
           >
-            <MessageOutlined className="chat-popup-info-icon" />
+            <MessageOutlined />
             <strong>{t("messaging.labels.messaging")}</strong>
           </div>
         )}

client/src/components/chat-popup/chat-popup.styles.scss

@@ -13,9 +13,6 @@
     height: 100%;
   }
 }
-.chat-popup-info-icon {
-  margin-right: 5px;
-}
 
 @media only screen and (min-width: 992px) {
   .chat-popup {

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

@@ -1,5 +1,5 @@
 import { PlusCircleOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -16,19 +16,15 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
-  const menu = (
+  const menu = bodyshop.md_messaging_presets.map((i, idx) => ({
-    <Menu>
+    label: i.label,
-      {bodyshop.md_messaging_presets.map((i, idx) => (
+    key: idx,
-        <Menu.Item onClick={() => setMessage(i.text)} key={idx}>
+    onClick: () => setMessage(i.text),
-          {i.label}
+  }));
-        </Menu.Item>
-      ))}
-    </Menu>
-  );
 
   return (
     <div className={className}>
-      <Dropdown trigger={["click"]} overlay={menu}>
+      <Dropdown trigger={["click"]} menu={{ items: menu }} placement="top">
         <PlusCircleOutlined />
       </Dropdown>
     </div>

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

@@ -1,59 +0,0 @@
-import { MailOutlined, PrinterOutlined } from "@ant-design/icons";
-import { Space, Spin } from "antd";
-import React, { useState } from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setEmailOptions } from "../../redux/email/email.actions";
-import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
-
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = (dispatch) => ({
-  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-});
-
-export function ChatPrintButton({ conversation }) {
-  const [loading, setLoading] = useState(false);
-
-  return (
-    <Space wrap>
-      <PrinterOutlined
-        onClick={() => {
-          setLoading(true);
-          GenerateDocument(
-            {
-              name: TemplateList("messaging").conversation_list.key,
-              variables: { id: conversation.id },
-            },
-            {
-              subject: TemplateList("messaging").conversation_list.subject,
-            },
-            "p",
-            conversation.id
-          );
-          setLoading(false);
-        }}
-      />
-      <MailOutlined
-        onClick={() => {
-          setLoading(true);
-          GenerateDocument(
-            {
-              name: TemplateList("messaging").conversation_list.key,
-              variables: { id: conversation.id },
-            },
-            {
-              subject: TemplateList("messaging").conversation_list.subject,
-            },
-            "e",
-            conversation.id
-          );
-          setLoading(false);
-        }}
-      />
-      {loading && <Spin />}
-    </Space>
-  );
-}
-export default connect(mapStateToProps, mapDispatchToProps)(ChatPrintButton);

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

@@ -35,15 +35,6 @@ export default function ContractsCarsComponent({
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => <div>{t(record.status)}</div>,
     },
-    {
-      title: t("courtesycars.fields.readiness"),
-      dataIndex: "readiness",
-      key: "readiness",
-      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
-      sortOrder:
-        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
-      render: (text, record) => t(record.readiness),
-    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",
@@ -68,14 +59,6 @@ export default function ContractsCarsComponent({
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
-    {
-      title: t("courtesycars.fields.color"),
-      dataIndex: "color",
-      key: "color",
-      sorter: (a, b) => alphaSort(a.color, b.color),
-      sortOrder:
-        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
-    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -110,9 +93,6 @@ export default function ContractsCarsComponent({
             (cc.model || "")
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
-            (cc.color || "")
-              .toLowerCase()
-              .includes(state.search.toLowerCase()) ||
             (cc.plate || "").toLowerCase().includes(state.search.toLowerCase())
         );
 

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

@@ -390,7 +390,7 @@ export function ContractConvertToRo({
 
   return (
     <div>
-      <Popover content={popContent} visible={visible}>
+      <Popover content={popContent} open={visible}>
         <Button
           onClick={() => setVisible(true)}
           loading={loading}

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

@@ -4,7 +4,7 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
-//import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
+import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
 import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
 import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
@@ -68,30 +68,6 @@ export default function ContractFormComponent({
             <FormDateTimePicker />
           </Form.Item>
         )}
-        {create && (
-          <Form.Item
-            shouldUpdate={(p, c) => p.scheduledreturn !== c.scheduledreturn}
-          >
-            {() => {
-              const insuranceOver =
-                selectedCar &&
-                selectedCar.insuranceexpires &&
-                moment(selectedCar.insuranceexpires)
-                  .endOf("day")
-                  .isBefore(moment(form.getFieldValue("scheduledreturn")));
-              if (insuranceOver)
-                return (
-                  <Space direction="vertical" style={{ color: "tomato" }}>
-                    <span>
-                      <WarningFilled style={{ marginRight: ".3rem" }} />
-                      {t("contracts.labels.insuranceexpired")}
-                    </span>
-                  </Space>
-                );
-              return <></>;
-            }}
-          </Form.Item>
-        )}
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item
@@ -114,17 +90,16 @@ export default function ContractFormComponent({
           >
             {() => {
               const mileageOver =
-                selectedCar && selectedCar.nextservicekm
+                selectedCar &&
-                  ? selectedCar.nextservicekm <= form.getFieldValue("kmstart")
+                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
-                  : false;
+
               const dueForService =
                 selectedCar &&
                 selectedCar.nextservicedate &&
-                moment(selectedCar.nextservicedate)
+                moment(selectedCar.nextservicedate).isBefore(
-                  .endOf("day")
+                  moment(form.getFieldValue("scheduledreturn"))
-                  .isSameOrBefore(
+                );
-                    moment(form.getFieldValue("scheduledreturn"))
+
-                  );
               if (mileageOver || dueForService)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
@@ -142,6 +117,7 @@ export default function ContractFormComponent({
                     </span>
                   </Space>
                 );
+
               return <></>;
             }}
           </Form.Item>
@@ -189,9 +165,7 @@ export default function ContractFormComponent({
               />
             </div>
           )}
-          {
+          <ContractLicenseDecodeButton form={form} />
-            //<ContractLicenseDecodeButton form={form} />
-          }
         </Space>
       </div>
       <LayoutFormRow header={t("contracts.labels.driverinformation")}>

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

@@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import {pageLimit} from "../../utils/config";
 
 export default function ContractsJobsComponent({
   loading,
@@ -176,7 +175,7 @@ export default function ContractsJobsComponent({
         loading={loading}
         pagination={{
           position: "top",
-          defaultPageSize: pageLimit,
+          defaultPageSize: 10,
           defaultCurrent: defaultCurrent,
         }}
         columns={columns}

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

@@ -2,10 +2,10 @@ 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";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import ContractJobsComponent from "./contract-jobs.component";
+import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -15,7 +15,6 @@ export function ContractJobsContainer({ selectedJobState, bodyshop }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
-      isConverted: true,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

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

@@ -55,7 +55,7 @@ export default function ContractLicenseDecodeButton({ form }) {
   return (
     <div>
       <Modal
-        visible={modalVisible}
+        open={modalVisible}
         okText={t("contracts.actions.senddltoform")}
         onOk={handleInsertForm}
         okButtonProps={{ disabled: !!!decodedBarcode }}

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

@@ -59,7 +59,7 @@ export function ContractsFindModalContainer({
 
   return (
     <Modal
-      visible={visible}
+      open={visible}
       width="70%"
       title={t("contracts.labels.findermodal")}
       onCancel={() => toggleModalVisible()}

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

@@ -4,16 +4,15 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
-import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import ContractsFindModalContainer from "../contracts-find-modal/contracts-find-modal.container";
+import { setModalContext } from "../../redux/modals/modals.actions";
 
-import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import moment from "moment";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -210,7 +209,7 @@ export function ContractsList({
         }}
         pagination={{
           position: "top",
-          pageSize: pageLimit,
+          pageSize: 25,
           current: parseInt(page || 1),
           total: total,
         }}

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

@@ -1,5 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -13,25 +13,14 @@ const mapStateToProps = createStructuredSelector({
 export function ContractsRatesChangeButton({ disabled, form, bodyshop }) {
   const { t } = useTranslation();
 
-  const handleClick = ({ item, key, keyPath }) => {
+  const menu = bodyshop.md_ccc_rates.map((rate, idx) => ({
-    const { label, ...rate } = item.props.value;
+    onClick: () => form.setFieldsValue(rate),
-    form.setFieldsValue(rate);
+    key: idx,
-  };
+    label: rate.label,
-
+  }));
-  const menu = (
-    <div>
-      <Menu onClick={handleClick}>
-        {bodyshop.md_ccc_rates.map((rate, idx) => (
-          <Menu.Item value={rate} key={idx}>
-            {rate.label}
-          </Menu.Item>
-        ))}
-      </Menu>
-    </div>
-  );
 
   return (
-    <Dropdown overlay={menu} disabled={disabled}>
+    <Dropdown menu={{ items: menu }} disabled={disabled}>
       <a
         className="ant-dropdown-link"
         href=" #"

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

@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
-import {pageLimit} from "../../utils/config";
 
 export default function CourtesyCarContractListComponent({
   contracts,
@@ -90,7 +89,7 @@ export default function CourtesyCarContractListComponent({
         scroll={{ x: true }}
         pagination={{
           position: "top",
-          pageSize: pageLimit,
+          pageSize: 25,
           current: parseInt(page || 1),
           total: totalContracts,
         }}

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

@@ -1,24 +1,20 @@
 import { WarningFilled } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { Button, Form, Input, InputNumber, PageHeader, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Input, InputNumber, Space } from "antd";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { CHECK_CC_FLEET_NUMBER } from "../../graphql/courtesy-car.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
-import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-export default function CourtesyCarCreateFormComponent({
+export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
-  form,
-  saveLoading,
-  newCC,
-}) {
   const { t } = useTranslation();
   const client = useApolloClient();
 
@@ -37,20 +33,8 @@ export default function CourtesyCarCreateFormComponent({
         }
       />
 
-      {newCC ? null : <FormFieldsChanged form={form} />}
+      {/* <FormFieldsChanged form={form} /> */}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
-        <Form.Item
-          label={t("courtesycars.fields.year")}
-          name="year"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.make")}
           name="make"
@@ -75,6 +59,18 @@ export default function CourtesyCarCreateFormComponent({
         >
           <Input />
         </Form.Item>
+        <Form.Item
+          label={t("courtesycars.fields.year")}
+          name="year"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.plate")}
           name="plate"
@@ -123,7 +119,7 @@ export default function CourtesyCarCreateFormComponent({
             },
           ]}
         >
-          <InputNumber min={0} precision={0} />
+          <InputNumber precision={0} />
         </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.fleetnumber")}
@@ -218,27 +214,49 @@ export default function CourtesyCarCreateFormComponent({
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
+        <Form.Item
-          <CourtesyCarReadiness />
+          label={t("courtesycars.fields.nextservicekm")}
+          name="nextservicekm"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber />
         </Form.Item>
         <div>
           <Form.Item
-            label={t("courtesycars.fields.nextservicekm")}
+            label={t("courtesycars.fields.nextservicedate")}
-            name="nextservicekm"
+            name="nextservicedate"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
           >
-            <InputNumber min={0} precision={0} />
+            <FormDatePicker />
           </Form.Item>
           <Form.Item
             shouldUpdate={(p, c) =>
-              p.mileage !== c.mileage || p.nextservicekm !== c.nextservicekm
+              p.mileage !== c.mileage ||
+              p.nextservicedate !== c.nextservicedate ||
+              p.nextservicekm !== c.nextservicekm
             }
           >
             {() => {
+              const nextservicedate = form.getFieldValue("nextservicedate");
               const nextservicekm = form.getFieldValue("nextservicekm");
-              const mileageOver = nextservicekm
+
-                ? nextservicekm <= form.getFieldValue("mileage")
+              const mileageOver =
-                : false;
+                nextservicekm <= form.getFieldValue("mileage");
-              if (mileageOver)
+
+              const dueForService =
+                nextservicedate && moment(nextservicedate).isBefore(moment());
+
+              if (mileageOver || dueForService)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
                     <span>
@@ -246,36 +264,6 @@ export default function CourtesyCarCreateFormComponent({
                       {t("contracts.labels.cardueforservice")}
                     </span>
                     <span>{`${nextservicekm} km`}</span>
-                  </Space>
-                );
-
-              return <></>;
-            }}
-          </Form.Item>
-        </div>
-        <div>
-          <Form.Item
-            label={t("courtesycars.fields.nextservicedate")}
-            name="nextservicedate"
-          >
-            <FormDatePicker />
-          </Form.Item>
-          <Form.Item
-            shouldUpdate={(p, c) => p.nextservicedate !== c.nextservicedate}
-          >
-            {() => {
-              const nextservicedate = form.getFieldValue("nextservicedate");
-              const dueForService =
-                nextservicedate &&
-                moment(nextservicedate).endOf("day").isSameOrBefore(moment());
-
-              if (dueForService)
-                return (
-                  <Space direction="vertical" style={{ color: "tomato" }}>
-                    <span>
-                      <WarningFilled style={{ marginRight: ".3rem" }} />
-                      {t("contracts.labels.cardueforservice")}
-                    </span>
                     <span>
                       <DateFormatter>{nextservicedate}</DateFormatter>
                     </span>
@@ -296,6 +284,12 @@ export default function CourtesyCarCreateFormComponent({
           <Form.Item
             label={t("courtesycars.fields.registrationexpires")}
             name="registrationexpires"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
           >
             <FormDatePicker />
           </Form.Item>
@@ -307,8 +301,7 @@ export default function CourtesyCarCreateFormComponent({
             {() => {
               const expires = form.getFieldValue("registrationexpires");
 
-              const dateover =
+              const dateover = expires && moment(expires).isBefore(moment());
-                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (
@@ -338,13 +331,14 @@ export default function CourtesyCarCreateFormComponent({
             <FormDatePicker />
           </Form.Item>
           <Form.Item
-            shouldUpdate={(p, c) => p.insuranceexpires !== c.insuranceexpires}
+            shouldUpdate={(p, c) =>
+              p.insuranceexpires !== c.insuranceexpires
+            }
           >
             {() => {
               const expires = form.getFieldValue("insuranceexpires");
 
-              const dateover =
+              const dateover = expires && moment(expires).isBefore(moment());
-                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (

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

@@ -34,32 +34,6 @@ const CourtesyCarFuelComponent = (props, ref) => {
       step={null}
       style={{ marginLeft: "2rem", marginRight: "2rem" }}
       {...props}
-      tooltip={{
-        formatter: (value) => {
-          switch (value) {
-            case 0:
-              return t("courtesycars.labels.fuel.empty");
-            case 13:
-              return t("courtesycars.labels.fuel.18");
-            case 25:
-              return t("courtesycars.labels.fuel.14");
-            case 38:
-              return t("courtesycars.labels.fuel.38");
-            case 50:
-              return t("courtesycars.labels.fuel.12");
-            case 63:
-              return t("courtesycars.labels.fuel.58");
-            case 75:
-              return t("courtesycars.labels.fuel.34");
-            case 88:
-              return t("courtesycars.labels.fuel.78");
-            case 100:
-              return t("courtesycars.labels.fuel.full");
-            default:
-              return value;
-          }
-        },
-      }}
     />
   );
 };

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

@@ -1,35 +0,0 @@
-import { Select } from "antd";
-import React, { forwardRef, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-const { Option } = Select;
-
-const CourtesyCarReadinessComponent = ({ value, onChange }, ref) => {
-  const [option, setOption] = useState(value);
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    if (value !== option && onChange) {
-      onChange(option);
-    }
-  }, [value, option, onChange]);
-
-  return (
-    <Select
-      allowClear
-      ref={ref}
-      value={option}
-      style={{
-        width: 100,
-      }}
-      onChange={setOption}
-    >
-      <Option value="courtesycars.readiness.ready">
-        {t("courtesycars.readiness.ready")}
-      </Option>
-      <Option value="courtesycars.readiness.notready">
-        {t("courtesycars.readiness.notready")}
-      </Option>
-    </Select>
-  );
-};
-export default forwardRef(CourtesyCarReadinessComponent);

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

@@ -64,7 +64,7 @@ export function CCReturnModalContainer({
   return (
     <Modal
       title={t("courtesycars.labels.return")}
-      visible={visible}
+      open={visible}
       onCancel={() => toggleModalVisible()}
       width={"90%"}
       okText={t("general.actions.save")}

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

@@ -37,9 +37,6 @@ const CourtesyCarStatusComponent = ({ value, onChange }, ref) => {
       <Option value="courtesycars.status.leasereturn">
         {t("courtesycars.status.leasereturn")}
       </Option>
-      <Option value="courtesycars.status.unavailable">
-        {t("courtesycars.status.unavailable")}
-      </Option>
     </Select>
   );
 };

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -3,11 +3,9 @@ import {
   Button,
   Card,
   Dropdown,
-  Input,
+  Input, Space,
-  Menu,
-  Space,
   Table,
-  Tooltip,
+  Tooltip
 } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
@@ -15,20 +13,15 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
-import useLocalStorage from "../../utils/useLocalStorage";
+import { TemplateList } from "../../utils/TemplateConstants";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
+    filteredInfo: { text: "" },
   });
   const [searchText, setSearchText] = useState("");
-  const [filter, setFilter] = useLocalStorage(
-    "filter_courtesy_cars_list",
-    null
-  );
   const { t } = useTranslation();
 
   const columns = [
@@ -55,16 +48,11 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       dataIndex: "status",
       key: "status",
       sorter: (a, b) => alphaSort(a.status, b.status),
-      filteredValue: filter?.status || null,
       filters: [
         {
           text: t("courtesycars.status.in"),
           value: "courtesycars.status.in",
         },
-        {
-          text: t("courtesycars.status.inservice"),
-          value: "courtesycars.status.inservice",
-        },
         {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
@@ -77,43 +65,23 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.leasereturn"),
           value: "courtesycars.status.leasereturn",
         },
-        {
-          text: t("courtesycars.status.unavailable"),
-          value: "courtesycars.status.unavailable",
-        },
       ],
-      onFilter: (value, record) => record.status === value,
+      onFilter: (value, record) => value.includes(record.status),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
-        const { nextservicedate, nextservicekm, mileage, insuranceexpires } =
+        const { nextservicedate, nextservicekm, mileage } = record;
-          record;
 
-        const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
+        const mileageOver = nextservicekm <= mileage;
 
         const dueForService =
-          nextservicedate &&
+          nextservicedate && moment(nextservicedate).isBefore(moment());
-          moment(nextservicedate).endOf("day").isSameOrBefore(moment());
-
-        const insuranceOver =
-          insuranceexpires &&
-          moment(insuranceexpires).endOf("day").isBefore(moment());
 
         return (
           <Space>
             {t(record.status)}
-            {(mileageOver || dueForService || insuranceOver) && (
+            {(mileageOver || dueForService) && (
-              <Tooltip
+              <Tooltip title={t("contracts.labels.cardueforservice")}>
-                title={
-                  (mileageOver || dueForService) && insuranceOver
-                    ? t("contracts.labels.insuranceexpired") +
-                      " / " +
-                      t("contracts.labels.cardueforservice")
-                    : insuranceOver
-                    ? t("contracts.labels.insuranceexpired")
-                    : t("contracts.labels.cardueforservice")
-                }
-              >
                 <WarningFilled style={{ color: "tomato" }} />
               </Tooltip>
             )}
@@ -121,27 +89,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         );
       },
     },
-    {
-      title: t("courtesycars.fields.readiness"),
-      dataIndex: "readiness",
-      key: "readiness",
-      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
-      filteredValue: filter?.readiness || null,
-      filters: [
-        {
-          text: t("courtesycars.readiness.ready"),
-          value: "courtesycars.readiness.ready",
-        },
-        {
-          text: t("courtesycars.readiness.notready"),
-          value: "courtesycars.readiness.notready",
-        },
-      ],
-      onFilter: (value, record) => value.includes(record.readiness),
-      sortOrder:
-        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
-      render: (text, record) => t(record.readiness),
-    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",
@@ -166,14 +113,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
-    {
-      title: t("courtesycars.fields.color"),
-      dataIndex: "color",
-      key: "color",
-      sorter: (a, b) => alphaSort(a.color, b.color),
-      sortOrder:
-        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
-    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -182,38 +121,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "plate" && state.sortedInfo.order,
     },
-    {
-      title: t("courtesycars.fields.fuel"),
-      dataIndex: "fuel",
-      key: "fuel",
-      sorter: (a, b) => a.fuel - b.fuel,
-      sortOrder:
-        state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
-      render: (text, record) => {
-        switch (record.fuel) {
-          case 100:
-            return t("courtesycars.labels.fuel.full");
-          case 88:
-            return t("courtesycars.labels.fuel.78");
-          case 75:
-            return t("courtesycars.labels.fuel.34");
-          case 63:
-            return t("courtesycars.labels.fuel.58");
-          case 50:
-            return t("courtesycars.labels.fuel.12");
-          case 38:
-            return t("courtesycars.labels.fuel.38");
-          case 25:
-            return t("courtesycars.labels.fuel.14");
-          case 13:
-            return t("courtesycars.labels.fuel.18");
-          case 0:
-            return t("courtesycars.labels.fuel.empty");
-          default:
-            return record.fuel;
-        }
-      },
-    },
     {
       title: t("courtesycars.labels.outwith"),
       dataIndex: "outwith",
@@ -244,8 +151,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, sortedInfo: sorter });
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-    setFilter(filters);
   };
 
   const tableData = searchText
@@ -258,7 +164,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           (c.year || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (c.make || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (c.model || "").toLowerCase().includes(searchText.toLowerCase()) ||
-          (c.plate || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (t(c.status) || "").toLowerCase().includes(searchText.toLowerCase())
       )
     : courtesycars;
@@ -272,10 +177,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           </Button>
           <Dropdown
             trigger="click"
-            overlay={
+            menu={{
-              <Menu>
+              items: [
-                <Menu.Item
+                {
-                  onClick={() =>
+                  label: t(
+                    "printcenter.courtesycarcontract.courtesy_car_inventory"
+                  ),
+                  key: "cc_inv",
+                  onClick: () =>
                     GenerateDocument(
                       {
                         name: TemplateList("courtesycar").courtesy_car_inventory
@@ -286,13 +195,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                       },
                       {},
                       "p"
-                    )
+                    ),
-                  }
+                },
-                >
+              ],
-                  {t("printcenter.courtesycarcontract.courtesy_car_inventory")}
+            }}
-                </Menu.Item>
-              </Menu>
-            }
           >
             <Button>{t("general.labels.print")}</Button>
           </Dropdown>

client/src/components/csi-response-form/csi-response-form.container.jsx

@@ -5,7 +5,6 @@ import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
 import { QUERY_CSI_RESPONSE_BY_PK } from "../../graphql/csi.queries";
-import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
@@ -45,13 +44,6 @@ export default function CsiResponseFormContainer() {
           readOnly
           componentList={data.csi_by_pk.csiquestion.config}
         />
-        {data.csi_by_pk.validuntil ? (
-          <>
-            {t("csi.fields.validuntil")}
-            {": "}
-            <DateFormatter>{data.csi_by_pk.validuntil}</DateFormatter>
-          </>
-        ) : null}
       </Form>
     </Card>
   );

client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx

@@ -5,11 +5,8 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
+import { alphaSort } from "../../utils/sorters";
-import { alphaSort, dateSort } from "../../utils/sorters";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
 
 export default function CsiResponseListPaginated({
   refetch,
@@ -18,23 +15,23 @@ export default function CsiResponseListPaginated({
   total,
 }) {
   const search = queryString.parse(useLocation().search);
-  const { responseid } = search;
+  const { responseid, page, sortcolumn, sortorder } = search;
   const history = useHistory();
-  const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" },
-    page: "",
   });
 
+  const { t } = useTranslation();
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
+      width: "8%",
       sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      sortOrder:
+      sortOrder: sortcolumn === "ro_number" && sortorder,
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.job.id}>
           {record.job.ro_number || t("general.labels.na")}
@@ -43,18 +40,15 @@ export default function CsiResponseListPaginated({
     },
     {
       title: t("jobs.fields.owner"),
-      dataIndex: "owner_name",
+      dataIndex: "owner",
-      key: "owner_name",
+      key: "owner",
-      sorter: (a, b) =>
+      ellipsis: true,
-        alphaSort(
+      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-          OwnerNameDisplayFunction(a.job),
+      width: "25%",
-          OwnerNameDisplayFunction(b.job)
+      sortOrder: sortcolumn === "owner" && sortorder,
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner_name" && state.sortedInfo.order,
       render: (text, record) => {
-        return record.job.ownerid ? (
+        return record.job.owner ? (
-          <Link to={"/manage/owners/" + record.job.ownerid}>
+          <Link to={"/manage/owners/" + record.job.owner.id}>
             <OwnerNameDisplay ownerObject={record.job} />
           </Link>
         ) : (
@@ -69,9 +63,9 @@ export default function CsiResponseListPaginated({
       dataIndex: "completedon",
       key: "completedon",
       ellipsis: true,
-      sorter: (a, b) => dateSort(a.completedon, b.completedon),
+      sorter: (a, b) => a.completedon - b.completedon,
-      sortOrder:
+      width: "25%",
-        state.sortedInfo.columnKey === "completedon" && state.sortedInfo.order,
+      sortOrder: sortcolumn === "completedon" && sortorder,
       render: (text, record) => {
         return record.completedon ? (
           <DateFormatter>{record.completedon}</DateFormatter>
@@ -81,12 +75,11 @@ export default function CsiResponseListPaginated({
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-      ...state,
+    search.page = pagination.current;
-      filteredInfo: filters,
+    search.sortcolumn = sorter.columnKey;
-      sortedInfo: sorter,
+    search.sortorder = sorter.order;
-      page: pagination.current,
+    history.push({ search: queryString.stringify(search) });
-    });
   };
 
   const handleOnRowClick = (record) => {
@@ -113,8 +106,8 @@ export default function CsiResponseListPaginated({
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: pageLimit,
+          pageSize: 25,
-          current: parseInt(state.page || 1),
+          current: parseInt(page || 1),
           total: total,
         }}
         columns={columns}
@@ -128,6 +121,13 @@ export default function CsiResponseListPaginated({
           selectedRowKeys: [responseid],
           type: "radio",
         }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            }, // click row
+          };
+        }}
       />
     </Card>
   );

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -1,169 +0,0 @@
-import {Card, Table, Tag} from "antd";
-import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
-import {useTranslation} from "react-i18next";
-import React, {useEffect, useState} from "react";
-import moment from "moment";
-import DashboardRefreshRequired from "../refresh-required.component";
-import axios from "axios";
-
-const fortyFiveDaysAgo = () => moment().subtract(45, 'days').toLocaleString();
-
-export default function JobLifecycleDashboardComponent({data, bodyshop, ...cardProps}) {
-    const {t} = useTranslation();
-    const [loading, setLoading] = useState(false);
-    const [lifecycleData, setLifecycleData] = useState(null);
-
-    useEffect(() => {
-        async function getLifecycleData() {
-            if (data && data.job_lifecycle) {
-                setLoading(true);
-                const response = await axios.post("/job/lifecycle", {
-                    jobids: data.job_lifecycle.map(x => x.id),
-                    statuses: bodyshop.md_ro_statuses
-                });
-                setLifecycleData(response.data.durations);
-                setLoading(false);
-            }
-        }
-
-        getLifecycleData().catch(e => {
-            console.error(`Error in getLifecycleData: ${e}`);
-        })
-    }, [data, bodyshop]);
-
-    const columns = [
-        {
-            title: t('job_lifecycle.columns.status'),
-            dataIndex: 'status',
-            bgColor: 'red',
-            key: 'status',
-            render: (text, record) => {
-                return <Tag color={record.color}>{record.status}</Tag>
-            }
-        },
-        {
-            title: t('job_lifecycle.columns.human_readable'),
-            dataIndex: 'humanReadable',
-            key: 'humanReadable',
-        },
-        {
-            title: t('job_lifecycle.columns.status_count'),
-            key: 'statusCount',
-            render: (text, record) => {
-                return lifecycleData.statusCounts[record.status];
-            }
-        },
-        {
-            title: t('job_lifecycle.columns.percentage'),
-            dataIndex: 'percentage',
-            key: 'percentage',
-            render: (text, record) => {
-                return record.percentage.toFixed(2) + '%';
-            }
-        },
-    ];
-
-    if (!data) return null;
-
-    if (!data.job_lifecycle || !lifecycleData) return <DashboardRefreshRequired {...cardProps} />;
-
-    const extra = `${t('job_lifecycle.content.calculated_based_on')} ${lifecycleData.jobs} ${t('job_lifecycle.content.jobs_in_since')} ${fortyFiveDaysAgo()}`
-
-    return (
-        <Card title={t("job_lifecycle.titles.dashboard")} {...cardProps}>
-            <LoadingSkeleton loading={loading}>
-                <div style={{overflow: 'scroll', height: "100%"}}>
-                    <div id="bar-container" style={{
-                        display: 'flex',
-                        width: '100%',
-                        height: '100px',
-                        textAlign: 'center',
-                        borderRadius: '5px',
-                        borderWidth: '5px',
-                        borderStyle: 'solid',
-                        borderColor: '#f0f2f5',
-                        margin: 0,
-                        padding: 0
-                    }}>
-                        {lifecycleData.summations.map((key, index, array) => {
-                            const isFirst = index === 0;
-                            const isLast = index === array.length - 1;
-                            return (
-                                <div key={key.status} style={{
-                                    overflow: 'hidden',
-                                    display: 'flex',
-                                    flexDirection: 'column',
-                                    justifyContent: 'center',
-                                    alignItems: 'center',
-                                    margin: 0,
-                                    padding: 0,
-
-                                    borderTop: '1px solid #f0f2f5',
-                                    borderBottom: '1px solid #f0f2f5',
-                                    borderLeft: isFirst ? '1px solid #f0f2f5' : undefined,
-                                    borderRight: isLast ? '1px solid #f0f2f5' : undefined,
-
-                                    backgroundColor: key.color,
-                                    width: `${key.percentage}%`
-                                }}
-                                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
-                                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
-                                >
-
-                                    {key.percentage > 15 ?
-                                        <>
-                                            <div>{key.roundedPercentage}</div>
-                                            <div style={{
-                                                backgroundColor: '#f0f2f5',
-                                                borderRadius: '5px',
-                                                paddingRight: '2px',
-                                                paddingLeft: '2px',
-                                                fontSize: '0.8rem',
-                                            }}>
-                                                {key.status}
-                                            </div>
-                                        </>
-                                        : null}
-                                </div>
-                            );
-                        })}
-                    </div>
-                    <Card extra={extra} type='inner' title={t('job_lifecycle.content.legend_title')}
-                          style={{marginTop: '10px'}}>
-                        <div>
-                            {lifecycleData.summations.map((key) => (
-                                <Tag color={key.color} style={{width: '13vh', padding: '4px', margin: '4px'}}>
-                                    <div
-                                        aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
-                                        title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
-                                        style={{
-                                            backgroundColor: '#f0f2f5',
-                                            color: '#000',
-                                            padding: '4px',
-                                            textAlign: 'center'
-                                        }}>
-                                        {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
-                                    </div>
-                                </Tag>
-                            ))}
-                        </div>
-                    </Card>
-                    <Card style={{marginTop: "5px"}} type='inner' title={t("job_lifecycle.titles.top_durations")}>
-                        <Table size="small" pagination={false} columns={columns}
-                               dataSource={lifecycleData.summations.sort((a, b) => b.value - a.value).slice(0, 3)}/>
-                    </Card>
-                </div>
-            </LoadingSkeleton>
-        </Card>
-    );
-}
-
-export const JobLifecycleDashboardGQL = `
-job_lifecycle: jobs(where: {
-    actual_in: {
-        _gte: "${moment().subtract(45, 'days').toISOString()}"
-    }
-}) {
-    id
-    actual_in
-} `;

client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx

@@ -6,7 +6,6 @@ import { alphaSort } from "../../../utils/sorters";
 import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
 import Dinero from "dinero.js";
 import DashboardRefreshRequired from "../refresh-required.component";
-import {pageLimit} from "../../../utils/config";
 
 export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
   const { t } = useTranslation();
@@ -119,7 +118,7 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
         <div style={{ height: "100%" }}>
           <Table
             onChange={handleTableChange}
-            pagination={{ position: "top", defaultPageSize: pageLimit }}
+            pagination={{ position: "top", defaultPageSize: 50 }}
             columns={columns}
             scroll={{ x: true, y: "calc(100% - 4em)" }}
             rowKey="id"

client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx

@@ -1,489 +0,0 @@
-import {
-  BranchesOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-} from "@ant-design/icons";
-import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
-import moment from "moment";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import { TimeFormatter } from "../../../utils/DateFormatter";
-import { onlyUnique } from "../../../utils/arrayHelper";
-import { alphaSort, dateSort } from "../../../utils/sorters";
-import useLocalStorage from "../../../utils/useLocalStorage";
-import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../../owner-name-display/owner-name-display.component";
-import DashboardRefreshRequired from "../refresh-required.component";
-
-export default function DashboardScheduledInToday({ data, ...cardProps }) {
-  const { t } = useTranslation();
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: {},
-  });
-  const [isTvModeScheduledIn, setIsTvModeScheduledIn] = useLocalStorage(
-    "isTvModeScheduledIn",
-    false
-  );
-
-  if (!data) return null;
-  if (!data.scheduled_in_today)
-    return <DashboardRefreshRequired {...cardProps} />;
-
-  const appt = []; // Flatten Data
-  data.scheduled_in_today.forEach((item) => {
-    if (item.job) {
-      var i = {
-        canceled: item.canceled,
-        id: item.id,
-        alt_transport: item.job.alt_transport,
-        clm_no: item.job.clm_no,
-        jobid: item.job.jobid,
-        joblines_body: item.job.joblines
-          .filter((l) => l.mod_lbr_ty !== "LAR")
-          .reduce((acc, val) => acc + val.mod_lb_hrs, 0),
-        joblines_ref: item.job.joblines
-          .filter((l) => l.mod_lbr_ty === "LAR")
-          .reduce((acc, val) => acc + val.mod_lb_hrs, 0),
-        ins_co_nm: item.job.ins_co_nm,
-        iouparent: item.job.iouparent,
-        ownerid: item.job.ownerid,
-        ownr_co_nm: item.job.ownr_co_nm,
-        ownr_ea: item.job.ownr_ea,
-        ownr_fn: item.job.ownr_fn,
-        ownr_ln: item.job.ownr_ln,
-        ownr_ph1: item.job.ownr_ph1,
-        ownr_ph2: item.job.ownr_ph2,
-        production_vars: item.job.production_vars,
-        ro_number: item.job.ro_number,
-        suspended: item.job.suspended,
-        v_make_desc: item.job.v_make_desc,
-        v_model_desc: item.job.v_model_desc,
-        v_model_yr: item.job.v_model_yr,
-        v_vin: item.job.v_vin,
-        vehicleid: item.job.vehicleid,
-        note: item.note,
-        start: item.start,
-        title: item.title,
-      };
-      appt.push(i);
-    }
-  });
-  appt.sort(function (a, b) {
-    return new moment(a.start) - new moment(b.start);
-  });
-
-  const tvFontSize = 16;
-  const tvFontWeight = "bold";
-
-  const tvColumns = [
-    {
-      title: t("appointments.fields.time"),
-      dataIndex: "start",
-      key: "start",
-      ellipsis: true,
-      sorter: (a, b) => dateSort(a.start, b.start),
-      sortOrder:
-        state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          <TimeFormatter>{record.start}</TimeFormatter>
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.jobid}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-              {record.ro_number || t("general.labels.na")}
-              {record.production_vars && record.production_vars.alert ? (
-                <ExclamationCircleFilled className="production-alert" />
-              ) : null}
-              {record.suspended && (
-                <PauseCircleOutlined style={{ color: "orangered" }} />
-              )}
-              {record.iouparent && (
-                <Tooltip title={t("jobs.labels.iou")}>
-                  <BranchesOutlined style={{ color: "orangered" }} />
-                </Tooltip>
-              )}
-            </span>
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-              <OwnerNameDisplay ownerObject={record} />
-            </span>
-          </Link>
-        ) : (
-          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
-            a.v_model_desc || ""
-          }`,
-          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-              {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-                record.v_model_desc || ""
-              }`}
-            </span>
-          </Link>
-        ) : (
-          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>{`${
-            record.v_model_yr || ""
-          } ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}</span>
-        );
-      },
-    },
-    {
-      title: t("appointments.fields.alt_transport"),
-      dataIndex: "alt_transport",
-      key: "alt_transport",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
-      sortOrder:
-        state.sortedInfo.columnKey === "alt_transport" &&
-        state.sortedInfo.order,
-      filters:
-        (appt &&
-          appt
-            .map((j) => j.alt_transport)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Alt. Transport",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.alt_transport),
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.alt_transport}
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.lab"),
-      dataIndex: "joblines_body",
-      key: "joblines_body",
-      sorter: (a, b) => a.joblines_body - b.joblines_body,
-      sortOrder:
-        state.sortedInfo.columnKey === "joblines_body" &&
-        state.sortedInfo.order,
-      align: "right",
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.joblines_body.toFixed(1)}
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.lar"),
-      dataIndex: "joblines_ref",
-      key: "joblines_ref",
-      sorter: (a, b) => a.joblines_ref - b.joblines_ref,
-      sortOrder:
-        state.sortedInfo.columnKey === "joblines_ref" && state.sortedInfo.order,
-      align: "right",
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.joblines_ref.toFixed(1)}
-        </span>
-      ),
-    },
-  ];
-
-  const columns = [
-    {
-      title: t("appointments.fields.time"),
-      dataIndex: "start",
-      key: "start",
-      ellipsis: true,
-      sorter: (a, b) => dateSort(a.start, b.start),
-      sortOrder:
-        state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
-      render: (text, record) => <TimeFormatter>{record.start}</TimeFormatter>,
-    },
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.jobid}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
-            ) : null}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
-            {record.iouparent && (
-              <Tooltip title={t("jobs.labels.iou")}>
-                <BranchesOutlined style={{ color: "orangered" }} />
-              </Tooltip>
-            )}
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("dashboard.labels.phone"),
-      dataIndex: "ownr_ph",
-      key: "ownr_ph",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
-        </Space>
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ea"),
-      dataIndex: "ownr_ea",
-      key: "ownr_ea",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
-      ),
-    },
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
-            a.v_model_desc || ""
-          }`,
-          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ins_co_nm"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
-      sortOrder:
-        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
-      filters:
-        (appt &&
-          appt
-            .map((j) => j.ins_co_nm)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Ins. Co.*",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.ins_co_nm),
-    },
-    {
-      title: t("appointments.fields.alt_transport"),
-      dataIndex: "alt_transport",
-      key: "alt_transport",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
-      sortOrder:
-        state.sortedInfo.columnKey === "alt_transport" &&
-        state.sortedInfo.order,
-      filters:
-        (appt &&
-          appt
-            .map((j) => j.alt_transport)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Alt. Transport",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.alt_transport),
-    },
-  ];
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
-
-  return (
-    <Card
-      title={t("dashboard.titles.scheduledindate", {
-        date: moment().startOf("day").format("MM/DD/YYYY"),
-      })}
-      extra={
-        <Space>
-          <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
-          <Switch
-            onClick={() => setIsTvModeScheduledIn(!isTvModeScheduledIn)}
-            defaultChecked={isTvModeScheduledIn}
-          />
-        </Space>
-      }
-      {...cardProps}
-    >
-      <div style={{ height: "100%" }}>
-        <Table
-          onChange={handleTableChange}
-          pagination={false}
-          columns={isTvModeScheduledIn ? tvColumns : columns}
-          scroll={{ x: true, y: "calc(100% - 2em)" }}
-          rowKey="id"
-          style={{ height: "85%" }}
-          dataSource={appt}
-          size={isTvModeScheduledIn ? "small" : "middle"}
-        />
-      </div>
-    </Card>
-  );
-}
-
-export const DashboardScheduledInTodayGql = `
-  scheduled_in_today: appointments(where: {start: {_gte: "${moment()
-    .startOf("day")
-    .toISOString()}", _lte: "${moment()
-  .endOf("day")
-  .toISOString()}"}, canceled: {_eq: false}, block: {_neq: true}}) {
-    canceled
-    id
-    job {
-      alt_transport
-      clm_no
-      jobid: id
-      joblines(where: {removed: {_eq: false}}) {
-        mod_lb_hrs
-        mod_lbr_ty
-      }
-      ins_co_nm
-      iouparent
-      ownerid
-      ownr_co_nm
-      ownr_ea
-      ownr_fn
-      ownr_ln
-      ownr_ph1
-      ownr_ph2
-      production_vars
-      ro_number
-      suspended
-      v_make_desc
-      v_model_desc
-      v_model_yr
-      v_vin
-      vehicleid
-    }
-    note
-    start
-    title
-  }
-`;

client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx

@@ -1,493 +0,0 @@
-import {
-  BranchesOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-} from "@ant-design/icons";
-import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
-import moment from "moment";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import { TimeFormatter } from "../../../utils/DateFormatter";
-import { onlyUnique } from "../../../utils/arrayHelper";
-import { alphaSort, dateSort } from "../../../utils/sorters";
-import useLocalStorage from "../../../utils/useLocalStorage";
-import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../../owner-name-display/owner-name-display.component";
-import DashboardRefreshRequired from "../refresh-required.component";
-
-export default function DashboardScheduledOutToday({ data, ...cardProps }) {
-  const { t } = useTranslation();
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: {},
-  });
-  const [isTvModeScheduledOut, setIsTvModeScheduledOut] = useLocalStorage(
-    "isTvModeScheduledOut",
-    false
-  );
-
-  if (!data) return null;
-  if (!data.scheduled_out_today)
-    return <DashboardRefreshRequired {...cardProps} />;
-
-  data.scheduled_out_today.forEach((item) => {
-    item.joblines_body = item.joblines
-      ? item.joblines
-          .filter((l) => l.mod_lbr_ty !== "LAR")
-          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
-      : 0;
-    item.joblines_ref = item.joblines
-      ? item.joblines
-          .filter((l) => l.mod_lbr_ty === "LAR")
-          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
-      : 0;
-  });
-  data.scheduled_out_today.sort(function (a, b) {
-    return new Date(a.scheduled_completion) - new Date(b.scheduled_completion);
-  });
-
-  const tvFontSize = 18;
-  const tvFontWeight = "bold";
-
-  const tvColumns = [
-    {
-      title: t("jobs.fields.scheduled_completion"),
-      dataIndex: "scheduled_completion",
-      key: "scheduled_completion",
-      ellipsis: true,
-      sorter: (a, b) =>
-        dateSort(a.scheduled_completion, b.scheduled_completion),
-      sortOrder:
-        state.sortedInfo.columnKey === "scheduled_completion" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.jobid}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-              {record.ro_number || t("general.labels.na")}
-              {record.production_vars && record.production_vars.alert ? (
-                <ExclamationCircleFilled className="production-alert" />
-              ) : null}
-              {record.suspended && (
-                <PauseCircleOutlined style={{ color: "orangered" }} />
-              )}
-              {record.iouparent && (
-                <Tooltip title={t("jobs.labels.iou")}>
-                  <BranchesOutlined style={{ color: "orangered" }} />
-                </Tooltip>
-              )}
-            </span>
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-              <OwnerNameDisplay ownerObject={record} />
-            </span>
-          </Link>
-        ) : (
-          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
-            a.v_model_desc || ""
-          }`,
-          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-              {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-                record.v_model_desc || ""
-              }`}
-            </span>
-          </Link>
-        ) : (
-          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>{`${
-            record.v_model_yr || ""
-          } ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}</span>
-        );
-      },
-    },
-    {
-      title: t("appointments.fields.alt_transport"),
-      dataIndex: "alt_transport",
-      key: "alt_transport",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
-      sortOrder:
-        state.sortedInfo.columnKey === "alt_transport" &&
-        state.sortedInfo.order,
-      filters:
-        (data.scheduled_out_today &&
-          data.scheduled_out_today
-            .map((j) => j.alt_transport)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Alt. Transport*",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.alt_transport),
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.alt_transport}
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.status"),
-      dataIndex: "status",
-      key: "status",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filters:
-        (data.scheduled_out_today &&
-          data.scheduled_out_today
-            .map((j) => j.status)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Status*",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.status),
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.status}
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.lab"),
-      dataIndex: "joblines_body",
-      key: "joblines_body",
-      sorter: (a, b) => a.joblines_body - b.joblines_body,
-      sortOrder:
-        state.sortedInfo.columnKey === "joblines_body" &&
-        state.sortedInfo.order,
-      align: "right",
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.joblines_body.toFixed(1)}
-        </span>
-      ),
-    },
-    {
-      title: t("jobs.fields.lar"),
-      dataIndex: "joblines_ref",
-      key: "joblines_ref",
-      sorter: (a, b) => a.joblines_ref - b.joblines_ref,
-      sortOrder:
-        state.sortedInfo.columnKey === "joblines_ref" && state.sortedInfo.order,
-      align: "right",
-      render: (text, record) => (
-        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
-          {record.joblines_ref.toFixed(1)}
-        </span>
-      ),
-    },
-  ];
-
-  const columns = [
-    {
-      title: t("jobs.fields.scheduled_completion"),
-      dataIndex: "scheduled_completion",
-      key: "scheduled_completion",
-      ellipsis: true,
-      sorter: (a, b) =>
-        dateSort(a.scheduled_completion, b.scheduled_completion),
-      sortOrder:
-        state.sortedInfo.columnKey === "scheduled_completion" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
-      ),
-    },
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.jobid}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
-            ) : null}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
-            {record.iouparent && (
-              <Tooltip title={t("jobs.labels.iou")}>
-                <BranchesOutlined style={{ color: "orangered" }} />
-              </Tooltip>
-            )}
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("dashboard.labels.phone"),
-      dataIndex: "ownr_ph",
-      key: "ownr_ph",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
-        </Space>
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ea"),
-      dataIndex: "ownr_ea",
-      key: "ownr_ea",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
-      ),
-    },
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
-            a.v_model_desc || ""
-          }`,
-          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ins_co_nm"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
-      sortOrder:
-        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
-      filters:
-        (data.scheduled_out_today &&
-          data.scheduled_out_today
-            .map((j) => j.ins_co_nm)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Ins. Co.*",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.ins_co_nm),
-    },
-    {
-      title: t("appointments.fields.alt_transport"),
-      dataIndex: "alt_transport",
-      key: "alt_transport",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
-      sortOrder:
-        state.sortedInfo.columnKey === "alt_transport" &&
-        state.sortedInfo.order,
-      filters:
-        (data.scheduled_out_today &&
-          data.scheduled_out_today
-            .map((j) => j.alt_transport)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Alt. Transport*",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) => value.includes(record.alt_transport),
-    },
-  ];
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
-
-  return (
-    <Card
-      title={t("dashboard.titles.scheduledoutdate", {
-        date: moment().startOf("day").format("MM/DD/YYYY"),
-      })}
-      extra={
-        <Space>
-          <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
-          <Switch
-            onClick={() => setIsTvModeScheduledOut(!isTvModeScheduledOut)}
-            defaultChecked={isTvModeScheduledOut}
-          />
-        </Space>
-      }
-      {...cardProps}
-    >
-      <div style={{ height: "100%" }}>
-        <Table
-          onChange={handleTableChange}
-          pagination={false}
-          columns={isTvModeScheduledOut ? tvColumns : columns}
-          scroll={{ x: true, y: "calc(100% - 2em)" }}
-          rowKey="id"
-          style={{ height: "85%" }}
-          dataSource={data.scheduled_out_today}
-          size={isTvModeScheduledOut ? "small" : "middle"}
-        />
-      </div>
-    </Card>
-  );
-}
-
-export const DashboardScheduledOutTodayGql = `
-  scheduled_out_today: jobs(where: {
-    date_invoiced: {_is_null: true}, 
-    ro_number: {_is_null: false}, 
-    voided: {_eq: false}, 
-    scheduled_completion: {_gte: "${moment().startOf("day").toISOString()}", 
-    _lte: "${moment().endOf("day").toISOString()}"}}) {
-      alt_transport
-      clm_no
-      jobid: id
-      joblines(where: {removed: {_eq: false}}) {
-        mod_lb_hrs
-        mod_lbr_ty
-      }
-      ins_co_nm
-      iouparent
-      ownerid
-      ownr_co_nm
-      ownr_ea
-      ownr_fn
-      ownr_ln
-      ownr_ph1
-      ownr_ph2
-      production_vars
-      ro_number
-      scheduled_completion
-      status
-      suspended
-      v_make_desc
-      v_model_desc
-      v_model_yr
-      v_vin
-      vehicleid
-
-  }
-`;

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -1,391 +1,357 @@
-import Icon, {SyncOutlined} from "@ant-design/icons";
+import Icon, { SyncOutlined } from "@ant-design/icons";
-import {gql, useMutation, useQuery} from "@apollo/client";
+import { gql, useMutation, useQuery } from "@apollo/client";
-import {Button, Dropdown, Menu, notification, PageHeader, Space} from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Dropdown, Menu, notification, Space } from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
-import React, {useState} from "react";
+import React, { useState } from "react";
-import {Responsive, WidthProvider} from "react-grid-layout";
+import { Responsive, WidthProvider } from "react-grid-layout";
-import {useTranslation} from "react-i18next";
+import { useTranslation } from "react-i18next";
-import {MdClose} from "react-icons/md";
+import { MdClose } from "react-icons/md";
-import {connect} from "react-redux";
+import { connect } from "react-redux";
-import {createStructuredSelector} from "reselect";
+import { createStructuredSelector } from "reselect";
-import {logImEXEvent} from "../../firebase/firebase.utils";
+import { logImEXEvent } from "../../firebase/firebase.utils";
-import {UPDATE_DASHBOARD_LAYOUT} from "../../graphql/user.queries";
+import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import DashboardMonthlyEmployeeEfficiency, {
-    DashboardMonthlyEmployeeEfficiencyGql,
+  DashboardMonthlyEmployeeEfficiencyGql,
 } from "../dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component";
 import DashboardMonthlyJobCosting from "../dashboard-components/monthly-job-costing/monthly-job-costing.component";
 import DashboardMonthlyLaborSales from "../dashboard-components/monthly-labor-sales/monthly-labor-sales.component";
 import DashboardMonthlyPartsSales from "../dashboard-components/monthly-parts-sales/monthly-parts-sales.component";
 import DashboardMonthlyRevenueGraph, {
-    DashboardMonthlyRevenueGraphGql,
+  DashboardMonthlyRevenueGraphGql,
 } from "../dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component";
 import DashboardProjectedMonthlySales, {
-    DashboardProjectedMonthlySalesGql,
+  DashboardProjectedMonthlySalesGql,
 } from "../dashboard-components/pojected-monthly-sales/projected-monthly-sales.component";
-import DashboardTotalProductionDollars
+import DashboardTotalProductionDollars from "../dashboard-components/total-production-dollars/total-production-dollars.component";
-    from "../dashboard-components/total-production-dollars/total-production-dollars.component";
 import DashboardTotalProductionHours, {
-    DashboardTotalProductionHoursGql,
+  DashboardTotalProductionHoursGql,
 } from "../dashboard-components/total-production-hours/total-production-hours.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 //Combination of the following:
 // /node_modules/react-grid-layout/css/styles.css
 // /node_modules/react-resizable/css/styles.css
-import DashboardScheduledInToday, {
-    DashboardScheduledInTodayGql,
-} from "../dashboard-components/scheduled-in-today/scheduled-in-today.component";
-import DashboardScheduledOutToday, {
-    DashboardScheduledOutTodayGql,
-} from "../dashboard-components/scheduled-out-today/scheduled-out-today.component";
-import JobLifecycleDashboardComponent, {
-    JobLifecycleDashboardGQL
-} from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component";
 import "./dashboard-grid.styles.scss";
-import {GenerateDashboardData} from "./dashboard-grid.utils";
+import { GenerateDashboardData } from "./dashboard-grid.utils";
 
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
 const mapStateToProps = createStructuredSelector({
-    currentUser: selectCurrentUser,
+  currentUser: selectCurrentUser,
-    bodyshop: selectBodyshop,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-    //setUserLanguage: language => dispatch(setUserLanguage(language))
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function DashboardGridComponent({currentUser, bodyshop}) {
+export function DashboardGridComponent({ currentUser, bodyshop }) {
-    const {t} = useTranslation();
+  const { t } = useTranslation();
-    const [state, setState] = useState({
+  const [state, setState] = useState({
-        ...(bodyshop.associations[0].user.dashboardlayout
+    ...(bodyshop.associations[0].user.dashboardlayout
-            ? bodyshop.associations[0].user.dashboardlayout
+      ? bodyshop.associations[0].user.dashboardlayout
-            : {items: [], layout: {}, layouts: []}),
+      : { items: [], layout: {}, layouts: [] }),
+  });
+
+  const { loading, error, data, refetch } = useQuery(
+    createDashboardQuery(state),
+    { fetchPolicy: "network-only", nextFetchPolicy: "network-only" }
+  );
+
+  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
+
+  const handleLayoutChange = async (layout, layouts) => {
+    logImEXEvent("dashboard_change_layout");
+
+    setState({ ...state, layout, layouts });
+
+    const result = await updateLayout({
+      variables: {
+        email: currentUser.email,
+        layout: { ...state, layout, layouts },
+      },
     });
+    if (!!result.errors) {
+      notification["error"]({
+        message: t("dashboard.errors.updatinglayout", {
+          message: JSON.stringify(result.errors),
+        }),
+      });
+    }
+  };
+  const handleRemoveComponent = (key) => {
+    logImEXEvent("dashboard_remove_component", { name: key });
+    const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-    const {loading, error, data, refetch} = useQuery(
+    const items = _.cloneDeep(state.items);
-        createDashboardQuery(state),
-        {fetchPolicy: "network-only", nextFetchPolicy: "network-only"}
-    );
 
-    const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
+    items.splice(idxToRemove, 1);
+    setState({ ...state, items });
+  };
 
-    const handleLayoutChange = async (layout, layouts) => {
+  const handleAddComponent = (e) => {
-        logImEXEvent("dashboard_change_layout");
+    logImEXEvent("dashboard_add_component", { name: e });
+    setState({
+      ...state,
+      items: [
+        ...state.items,
+        {
+          i: e.key,
+          x: (state.items.length * 2) % (state.cols || 12),
+          y: 99, // puts it at the bottom
+          w: componentList[e.key].w || 2,
+          h: componentList[e.key].h || 2,
+        },
+      ],
+    });
+  };
 
-        setState({...state, layout, layouts});
+  const dashboarddata = React.useMemo(
+    () => GenerateDashboardData(data),
+    [data]
+  );
+  const existingLayoutKeys = state.items.map((i) => i.i);
+  const addComponentOverlay = (
+    <Menu
+      onClick={handleAddComponent}
+      items={Object.keys(componentList).map((key) => ({
+        key: key,
+        value: key,
+        disabled: existingLayoutKeys.includes(key),
+        label: componentList[key].label,
+      }))}
+    ></Menu>
+  );
 
-        const result = await updateLayout({
+  if (error) return <AlertComponent message={error.message} type="error" />;
-            variables: {
+
-                email: currentUser.email,
+  return (
-                layout: {...state, layout, layouts},
+    <div>
-            },
+      <PageHeader
-        });
+        extra={
-        if (!!result.errors) {
+          <Space>
-            notification["error"]({
+            <Button onClick={() => refetch()}>
-                message: t("dashboard.errors.updatinglayout", {
+              <SyncOutlined />
-                    message: JSON.stringify(result.errors),
+            </Button>
-                }),
+            <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
-            });
+              <Button>{t("dashboard.actions.addcomponent")}</Button>
+            </Dropdown>
+          </Space>
         }
-    };
+      />
-    const handleRemoveComponent = (key) => {
-        logImEXEvent("dashboard_remove_component", {name: key});
-        const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-        const items = _.cloneDeep(state.items);
+      <ResponsiveReactGridLayout
-
+        className="layout"
-        items.splice(idxToRemove, 1);
+        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
-        setState({...state, items});
+        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
-    };
+        width="100%"
-
+        layouts={state.layouts}
-    const handleAddComponent = (e) => {
+        onLayoutChange={handleLayoutChange}
-        logImEXEvent("dashboard_add_component", {name: e});
+        //   onBreakpointChange={onBreakpointChange}
-        setState({
+      >
-            ...state,
+        {state.items.map((item, index) => {
-            items: [
+          const TheComponent = componentList[item.i].component;
-                ...state.items,
+          return (
-                {
+            <div
-                    i: e.key,
+              key={item.i}
-                    x: (state.items.length * 2) % (state.cols || 12),
+              data-grid={{
-                    y: 99, // puts it at the bottom
+                ...item,
-                    w: componentList[e.key].w || 2,
+                minH: componentList[item.i].minH || 1,
-                    h: componentList[e.key].h || 2,
+                minW: componentList[item.i].minW || 1,
-                },
+              }}
-            ],
-        });
-    };
-
-    const dashboarddata = React.useMemo(
-        () => GenerateDashboardData(data),
-        [data]
-    );
-    const existingLayoutKeys = state.items.map((i) => i.i);
-    const addComponentOverlay = (
-        <Menu onClick={handleAddComponent}>
-            {Object.keys(componentList).map((key) => (
-                <Menu.Item
-                    key={key}
-                    value={key}
-                    disabled={existingLayoutKeys.includes(key)}
-                >
-                    {componentList[key].label}
-                </Menu.Item>
-            ))}
-        </Menu>
-    );
-
-    if (error) return <AlertComponent message={error.message} type="error"/>;
-
-    return (
-        <div>
-            <PageHeader
-                extra={
-                    <Space>
-                        <Button onClick={() => refetch()}>
-                            <SyncOutlined/>
-                        </Button>
-                        <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
-                            <Button>{t("dashboard.actions.addcomponent")}</Button>
-                        </Dropdown>
-                    </Space>
-                }
-            />
-
-            <ResponsiveReactGridLayout
-                className="layout"
-                breakpoints={{lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0}}
-                cols={{lg: 12, md: 10, sm: 6, xs: 4, xxs: 2}}
-                width="100%"
-                layouts={state.layouts}
-                onLayoutChange={handleLayoutChange}
-                //   onBreakpointChange={onBreakpointChange}
             >
-                {state.items.map((item, index) => {
+              <LoadingSkeleton loading={loading}>
-                    const TheComponent = componentList[item.i].component;
+                <Icon
-                    return (
+                  component={MdClose}
-                        <div
+                  key={item.i}
-                            key={item.i}
+                  style={{
-                            data-grid={{
+                    position: "absolute",
-                                ...item,
+                    zIndex: "2",
-                                minH: componentList[item.i].minH || 1,
+                    right: ".25rem",
-                                minW: componentList[item.i].minW || 1,
+                    top: ".25rem",
-                            }}
+                    cursor: "pointer",
-                        >
+                  }}
-                            <LoadingSkeleton loading={loading}>
+                  onClick={() => handleRemoveComponent(item.i)}
-                                <Icon
+                />
-                                    component={MdClose}
+                <TheComponent className="dashboard-card" data={dashboarddata} />
-                                    key={item.i}
+              </LoadingSkeleton>
-                                    style={{
+            </div>
-                                        position: "absolute",
+          );
-                                        zIndex: "2",
+        })}
-                                        right: ".25rem",
+      </ResponsiveReactGridLayout>
-                                        top: ".25rem",
+    </div>
-                                        cursor: "pointer",
+  );
-                                    }}
-                                    onClick={() => handleRemoveComponent(item.i)}
-                                />
-                                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboarddata}/>
-                            </LoadingSkeleton>
-                        </div>
-                    );
-                })}
-            </ResponsiveReactGridLayout>
-        </div>
-    );
 }
 
 export default connect(
-    mapStateToProps,
+  mapStateToProps,
-    mapDispatchToProps
+  mapDispatchToProps
 )(DashboardGridComponent);
 
 const componentList = {
-    ProductionDollars: {
+  ProductionDollars: {
-        label: i18next.t("dashboard.titles.productiondollars"),
+    label: i18next.t("dashboard.titles.productiondollars"),
-        component: DashboardTotalProductionDollars,
+    component: DashboardTotalProductionDollars,
-        gqlFragment: null,
+    gqlFragment: null,
-        w: 1,
+    w: 1,
-        h: 1,
+    h: 1,
-        minW: 2,
+    minW: 2,
-        minH: 1,
+    minH: 1,
-    },
+  },
-    ProductionHours: {
+  ProductionHours: {
-        label: i18next.t("dashboard.titles.productionhours"),
+    label: i18next.t("dashboard.titles.productionhours"),
-        component: DashboardTotalProductionHours,
+    component: DashboardTotalProductionHours,
-        gqlFragment: DashboardTotalProductionHoursGql,
+    gqlFragment: DashboardTotalProductionHoursGql,
-        w: 3,
+    w: 3,
-        h: 1,
+    h: 1,
-        minW: 3,
+    minW: 3,
-        minH: 1,
+    minH: 1,
-    },
+  },
-    ProjectedMonthlySales: {
+  ProjectedMonthlySales: {
-        label: i18next.t("dashboard.titles.projectedmonthlysales"),
+    label: i18next.t("dashboard.titles.projectedmonthlysales"),
-        component: DashboardProjectedMonthlySales,
+    component: DashboardProjectedMonthlySales,
-        gqlFragment: DashboardProjectedMonthlySalesGql,
+    gqlFragment: DashboardProjectedMonthlySalesGql,
-        w: 2,
+    w: 2,
-        h: 1,
+    h: 1,
-        minW: 2,
+    minW: 2,
-        minH: 1,
+    minH: 1,
-    },
+  },
-    MonthlyRevenueGraph: {
+  MonthlyRevenueGraph: {
-        label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
+    label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
-        component: DashboardMonthlyRevenueGraph,
+    component: DashboardMonthlyRevenueGraph,
-        gqlFragment: DashboardMonthlyRevenueGraphGql,
+    gqlFragment: DashboardMonthlyRevenueGraphGql,
-        w: 4,
+    w: 4,
-        h: 2,
+    h: 2,
-        minW: 4,
+    minW: 4,
-        minH: 2,
+    minH: 2,
-    },
+  },
-    MonthlyJobCosting: {
+  MonthlyJobCosting: {
-        label: i18next.t("dashboard.titles.monthlyjobcosting"),
+    label: i18next.t("dashboard.titles.monthlyjobcosting"),
-        component: DashboardMonthlyJobCosting,
+    component: DashboardMonthlyJobCosting,
-        gqlFragment: null,
+    gqlFragment: null,
-        minW: 6,
+    minW: 6,
-        minH: 3,
+    minH: 3,
-        w: 6,
+    w: 6,
-        h: 3,
+    h: 3,
-    },
+  },
-    MonthlyPartsSales: {
+  MonthlyPartsSales: {
-        label: i18next.t("dashboard.titles.monthlypartssales"),
+    label: i18next.t("dashboard.titles.monthlypartssales"),
-        component: DashboardMonthlyPartsSales,
+    component: DashboardMonthlyPartsSales,
-        gqlFragment: null,
+    gqlFragment: null,
-        minW: 2,
+    minW: 2,
-        minH: 2,
+    minH: 2,
-        w: 2,
+    w: 2,
-        h: 2,
+    h: 2,
-    },
+  },
-    MonthlyLaborSales: {
+  MonthlyLaborSales: {
-        label: i18next.t("dashboard.titles.monthlylaborsales"),
+    label: i18next.t("dashboard.titles.monthlylaborsales"),
-        component: DashboardMonthlyLaborSales,
+    component: DashboardMonthlyLaborSales,
-        gqlFragment: null,
+    gqlFragment: null,
-        minW: 2,
+    minW: 2,
-        minH: 2,
+    minH: 2,
-        w: 2,
+    w: 2,
-        h: 2,
+    h: 2,
-    },
+  },
-    // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
+  MonthlyEmployeeEfficency: {
-    MonthlyEmployeeEfficency: {
+    label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
-        label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
+    component: DashboardMonthlyEmployeeEfficiency,
-        component: DashboardMonthlyEmployeeEfficiency,
+    gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
-        gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
+    minW: 2,
-        minW: 2,
+    minH: 2,
-        minH: 2,
+    w: 2,
-        w: 2,
+    h: 2,
-        h: 2,
+  },
-    },
-    ScheduleInToday: {
-        label: i18next.t("dashboard.titles.scheduledintoday"),
-        component: DashboardScheduledInToday,
-        gqlFragment: DashboardScheduledInTodayGql,
-        minW: 6,
-        minH: 2,
-        w: 10,
-        h: 3,
-    },
-    ScheduleOutToday: {
-        label: i18next.t("dashboard.titles.scheduledouttoday"),
-        component: DashboardScheduledOutToday,
-        gqlFragment: DashboardScheduledOutTodayGql,
-        minW: 6,
-        minH: 2,
-        w: 10,
-        h: 3,
-    },
-    JobLifecycle: {
-        label: i18next.t("dashboard.titles.joblifecycle"),
-        component: JobLifecycleDashboardComponent,
-        gqlFragment: JobLifecycleDashboardGQL,
-        minW: 6,
-        minH: 3,
-        w: 6,
-        h: 3,
-    },
 };
 
 const createDashboardQuery = (state) => {
-    const componentBasedAdditions =
+  const componentBasedAdditions =
-        state &&
+    state &&
-        Array.isArray(state.layout) &&
+    Array.isArray(state.layout) &&
-        state.layout
+    state.layout
-            .map((item, index) => componentList[item.i].gqlFragment || "")
+      .map((item, index) => componentList[item.i].gqlFragment || "")
-            .join("");
+      .join("");
-    return gql`
+  return gql`
-        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
+    query QUERY_DASHBOARD_DETAILS {
-            monthly_sales: jobs(where: {_and: [
+         ${componentBasedAdditions || ""}
-                { voided: {_eq: false}},
+      monthly_sales: jobs(where: {_and: [
-                {date_invoiced: {_gte: "${moment()
+        { voided: {_eq: false}},
+        {date_invoiced: {_gte: "${moment()
           .startOf("month")
-                .startOf("day")
+          .startOf("day")
-                .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+          .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
-      id
+    id
-                ro_number
+    ro_number
-                date_invoiced
+    date_invoiced
-                job_totals
+    job_totals
-                rate_la1
+          rate_la1
-                rate_la2
+      rate_la2
-                rate_la3
+      rate_la3
-                rate_la4
+      rate_la4
-                rate_laa
+      rate_laa
-                rate_lab
+      rate_lab
-                rate_lad
+      rate_lad
-                rate_lae
+      rate_lae
-                rate_laf
+      rate_laf
-                rate_lag
+      rate_lag
-                rate_lam
+      rate_lam
-                rate_lar
+      rate_lar
-                rate_las
+      rate_las
-                rate_lau
+      rate_lau
-                rate_ma2s
+      rate_ma2s
-                rate_ma2t
+      rate_ma2t
-                rate_ma3s
+      rate_ma3s
-                rate_mabl
+      rate_mabl
-                rate_macs
+      rate_macs
-                rate_mahw
+      rate_mahw
-                rate_mapa
+      rate_mapa
-                rate_mash
+      rate_mash
-                rate_matd
+      rate_matd
-                joblines(where: { removed: { _eq: false } }) {
+    joblines(where: { removed: { _eq: false } }) {
-                    id
+        id
-                    mod_lbr_ty
+        mod_lbr_ty
-                    mod_lb_hrs
+        mod_lb_hrs
-                    act_price
+        act_price
-                    part_qty
+        part_qty
-                    part_type
+        part_type
-                }
+    }
-                }
+  }
-                production_jobs: jobs(where: { inproduction: { _eq: true } }) {
+      production_jobs: jobs(where: { inproduction: { _eq: true } }) {
-                    id
+        id
-                    ro_number
+        ro_number
-                    ins_co_nm
+        ins_co_nm
-                    job_totals
+        job_totals
-                    joblines(where: { removed: { _eq: false } }) {
+        joblines(where: { removed: { _eq: false } }) {
-                    id
+          id
-                    mod_lbr_ty
+          mod_lbr_ty
-                    mod_lb_hrs
+          mod_lb_hrs
-                    act_price
+          act_price
-                    part_qty
+          part_qty
-                    part_type
+          part_type
-                }
+        }
-                labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
+        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
-                    aggregate {
+          aggregate {
-                        sum {
+            sum {
-                            mod_lb_hrs
+              mod_lb_hrs
-                        }
+            }
-                    }
+          }
-                }
+        }
-                larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
+        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
-                    aggregate {
+          aggregate {
-                        sum {
+            sum {
-                            mod_lb_hrs
+              mod_lb_hrs
-                        }
+            }
-                    }
+          }
-                }
+        }
-                }
+      }
-            }`;
+    }
+  `;
 };

client/src/components/dashboard-grid/dashboard-grid.styles.scss

@@ -128,7 +128,7 @@
   height: 100%;
   width: 100%;
   .ant-card-body {
-    height: calc(100% - 2rem);
+    height: 80%;
     width: 100%;
     // //  background-color: red;
     // height: 90%;

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

@@ -8,8 +8,6 @@ export default function DataLabel({
   vertical,
   visible = true,
   valueStyle = {},
-  valueClassName,
-  onValueClick,
   ...props
 }) {
   if (!visible || (hideIfNull && !!!children)) return null;
@@ -18,7 +16,7 @@ export default function DataLabel({
     <div {...props} style={{ display: "flex" }}>
       <div
         style={{
-         // flex: 2,
+          flex: 2,
           marginRight: ".2rem",
         }}
       >
@@ -30,10 +28,7 @@ export default function DataLabel({
           marginLeft: ".3rem",
           fontWeight: "bolder",
           wordWrap: "break-word",
-          cursor: onValueClick !== undefined ? "pointer" : "",
         }}
-        className={valueClassName}
-        onClick={onValueClick}
       >
         {typeof children === "string" ? (
           <Typography.Text style={valueStyle}>{children}</Typography.Text>

client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx

@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -67,7 +66,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       key: "status",
     },
     {
-      title: t("bills.fields.invoice_number"),
+      title: t("jobs.fields.ro_number"),
       dataIndex: ["Posting", "Reference"],
       key: "reference",
     },
@@ -118,7 +117,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       }
     >
       <Table
-        pagination={{ position: "top", defaultPageSize: pageLimit }}
+        pagination={{ position: "top", defaultPageSize: 50 }}
         columns={columns}
         rowKey={(record) => `${record.InvoiceNumber}${record.Account}`}
         dataSource={allocationsSummary}

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -6,7 +6,6 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import Dinero from "dinero.js";
 import { SyncOutlined } from "@ant-design/icons";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -95,7 +94,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
         <Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
       )}
       <Table
-        pagination={{ position: "top", defaultPageSize: pageLimit }}
+        pagination={{ position: "top", defaultPageSize: 50 }}
         columns={columns}
         rowKey="center"
         dataSource={allocationsSummary}

client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx

@@ -51,7 +51,7 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
     <>
       <Modal
         width={"90%"}
-        visible={visible}
+        open={visible}
         onCancel={() => setVisible(false)}
         onOk={() => {
           form.setFieldsValue({

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -6,13 +6,10 @@ import {
   Dropdown,
   Form,
   Input,
-  InputNumber,
+  InputNumber, Select,
-  Menu,
-  Select,
   Space,
   Statistic,
-  Switch,
+  Typography
-  Typography,
 } from "antd";
 import Dinero from "dinero.js";
 import moment from "moment";
@@ -184,20 +181,6 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
             <Space>
               <DmsCdkMakes form={form} socket={socket} job={job} />
               <DmsCdkMakesRefetch />
-              <Form.Item
-                name="dms_unsold"
-                label={t("jobs.fields.dms.dms_unsold")}
-                initialValue={false}
-              >
-                <Switch />
-              </Form.Item>
-              <Form.Item
-                name="dms_model_override"
-                label={t("jobs.fields.dms.dms_model_override")}
-                initialValue={false}
-              >
-                <Switch />
-              </Form.Item>
             </Space>
           </div>
         )}
@@ -292,36 +275,32 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
                           <div>
                             {t("jobs.fields.dms.payer.controlnumber")}{" "}
                             <Dropdown
-                              overlay={
+                              menu={{
-                                <Menu>
+                                items:
-                                  {bodyshop.cdk_configuration.controllist &&
+                                  bodyshop.cdk_configuration.controllist &&
-                                    bodyshop.cdk_configuration.controllist.map(
+                                  bodyshop.cdk_configuration.controllist.map(
-                                      (key, idx) => (
+                                    (key, idx) => ({
-                                        <Menu.Item
+                                      key: idx,
-                                          key={idx}
+                                      label: key.name,
-                                          onClick={() => {
+                                      onClick: () => {
-                                            form.setFieldsValue({
+                                        form.setFieldsValue({
-                                              payers: form
+                                          payers: form
-                                                .getFieldValue("payers")
+                                            .getFieldValue("payers")
-                                                .map((row, mapIndex) => {
+                                            .map((row, mapIndex) => {
-                                                  if (index !== mapIndex)
+                                              if (index !== mapIndex)
-                                                    return row;
+                                                return row;
 
-                                                  return {
+                                              return {
-                                                    ...row,
+                                                ...row,
-                                                    controlnumber:
+                                                controlnumber:
-                                                      key.controlnumber,
+                                                  key.controlnumber,
-                                                  };
+                                              };
-                                                }),
+                                            }),
-                                            });
+                                        });
-                                          }}
+                                      },
-                                        >
+                                    })
-                                          {key.name}
+                                  ),
-                                        </Menu.Item>
+                              }}
-                                      )
-                                    )}
-                                </Menu>
-                              }
                             >
                               <a href=" #" onClick={(e) => e.preventDefault()}>
                                 <DownOutlined />

client/src/components/email-overlay/email-overlay.component.jsx

@@ -1,28 +1,28 @@
 import { UploadOutlined, UserAddOutlined } from "@ant-design/icons";
 import {
-  Button,
   Divider,
-  Dropdown,
   Form,
   Input,
-  Menu,
   Select,
-  Space,
   Tabs,
   Upload,
+  Space,
+  Menu,
+  Dropdown,
+  Button,
 } from "antd";
-import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import EmailDocumentsComponent from "../email-documents/email-documents.component";
+import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectEmailConfig } from "../../redux/email/email.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { CreateExplorerLinkForJob } from "../../utils/localmedia";
-import EmailDocumentsComponent from "../email-documents/email-documents.component";
+import { selectEmailConfig } from "../../redux/email/email.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -54,51 +54,26 @@ export function EmailOverlayComponent({
       ]),
     });
   };
-  const handle_CC_Click = ({ item, key, keyPath }) => {
-    const email = item.props.value;
-    form.setFieldsValue({
-      cc: _.uniq([
-        ...(form.getFieldValue("cc") || ""),
-        ...(typeof email === "string" ? [email] : email),
-      ]),
-    });
-  };
 
   const menu = (
     <div>
-      <Menu onClick={handleClick}>
+      <Menu
-        {bodyshop.employees
+        onClick={handleClick}
-          .filter((e) => e.user_email)
+        items={[
-          .map((e, idx) => (
+          ...bodyshop.employees
-            <Menu.Item value={e.user_email} key={idx}>
+            .filter((e) => e.user_email)
-              {`${e.first_name} ${e.last_name}`}
+            .map((e, idx) => ({
-            </Menu.Item>
+              value: e.user_email,
-          ))}
+              key: idx,
-        {bodyshop.md_to_emails.map((e, idx) => (
+              label: `${e.first_name} ${e.last_name}`,
-          <Menu.Item value={e.emails} key={idx + "group"}>
+            })),
-            {e.label}
+          ...bodyshop.md_to_emails.map((e, idx) => ({
-          </Menu.Item>
+            value: e.emails,
-        ))}
+            key: idx + "group",
-      </Menu>
+            label: e.label,
-    </div>
+          })),
-  );
+        ]}
-
+      />
-  const menuCC = (
-    <div>
-      <Menu onClick={handle_CC_Click}>
-        {bodyshop.employees
-          .filter((e) => e.user_email)
-          .map((e, idx) => (
-            <Menu.Item value={e.user_email} key={idx}>
-              {`${e.first_name} ${e.last_name}`}
-            </Menu.Item>
-          ))}
-        {bodyshop.md_to_emails.map((e, idx) => (
-          <Menu.Item value={e.emails} key={idx + "group"}>
-            {e.label}
-          </Menu.Item>
-        ))}
-      </Menu>
     </div>
   );
 
@@ -150,23 +125,7 @@ export function EmailOverlayComponent({
       >
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
-      <Form.Item
+      <Form.Item label={t("emails.fields.cc")} name="cc">
-        label={
-          <Space>
-            {t("emails.fields.cc")}
-            <Dropdown overlay={menuCC}>
-              <a
-                className="ant-dropdown-link"
-                href=" #"
-                onClick={(e) => e.preventDefault()}
-              >
-                <UserAddOutlined />
-              </a>
-            </Dropdown>
-          </Space>
-        }
-        name="cc"
-      >
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
       <Form.Item

client/src/components/email-overlay/email-overlay.container.jsx

@@ -109,7 +109,7 @@ export function EmailOverlayContainer({
               ]
             : []),
         ],
-        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.fullsize),
+        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
         //attachments,
       });
       notification["success"]({ message: t("emails.successes.sent") });
@@ -174,7 +174,7 @@ export function EmailOverlayContainer({
   return (
     <Modal
       destroyOnClose={true}
-      visible={modalVisible}
+      open={modalVisible}
       maskClosable={false}
       width={"80%"}
       onOk={() => form.submit()}

client/src/components/error-boundary/error-boundary.component.jsx

@@ -2,7 +2,7 @@ import { Button, Col, Collapse, Result, Row, Space } from "antd";
 import React from "react";
 import { withTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import * as Sentry from "@sentry/react";
+
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
@@ -138,6 +138,7 @@ class ErrorBoundary extends React.Component {
   }
 }
 
-export default Sentry.withErrorBoundary(
+export default connect(
-  connect(mapStateToProps, mapDispatchToProps)(withTranslation()(ErrorBoundary))
+  mapStateToProps,
-);
+  mapDispatchToProps
+)(withTranslation()(ErrorBoundary));

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -65,17 +65,8 @@ export function FormDatePicker({
       });
     }
 
-    if (_a.isValid() && onChange) {
+    if (_a.isValid() && onChange)
-      if (onlyFuture) {
+      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
-        if (moment().subtract(1, "day").isBefore(_a)) {
-          onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
-        } else {
-          onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
-        }
-      } else {
-        onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
-      }
-    }
   };
 
   return (

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -1,9 +1,9 @@
 import React, { forwardRef } from "react";
 //import DatePicker from "react-datepicker";
 //import "react-datepicker/src/stylesheets/datepicker.scss";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import { TimePicker } from "antd";
 import moment from "moment";
-import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //To be used as a form element only.
 
 const DateTimePicker = (
@@ -26,21 +26,20 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
-        onlyFuture={onlyFuture}
         isDateOnly={false}
       />
 
       <TimePicker
-        value={value ? moment(value) : null}
+      value={value ? moment(value) : null}
-        {...(onlyFuture && {
+      {...(onlyFuture && {
-          disabledDate: (d) => moment().isAfter(d),
+        disabledDate: (d) => moment().isAfter(d),
-        })}
+      })}
-        onChange={onChange}
+      onChange={onChange}
-        showSecond={false}
+      showSecond={false}
-        minuteStep={15}
+      minuteStep={15}
-        onBlur={onBlur}
+      onBlur={onBlur}
-        format="hh:mm a"
+      format="hh:mm a"
-        {...restProps}
+      {...restProps}
       />
     </div>
   );

client/src/components/form-input-number-calculator/form-input-number-calculator.component.jsx

@@ -94,7 +94,7 @@ const FormInputNUmberCalculator = (
 
   return (
     <div>
-      <Popover content={popContent} visible={history.length > 0}>
+      <Popover content={popContent} open={history.length > 0}>
         <InputNumber
           ref={ref}
           value={value}

client/src/components/global-search/global-search-os.component.jsx

@@ -1,190 +0,0 @@
-import { AutoComplete, Divider, Input, Space } from "antd";
-import axios from "axios";
-import _ from "lodash";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
-
-export default function GlobalSearchOs() {
-  const { t } = useTranslation();
-  const [loading, setLoading] = useState(false);
-  const [data, setData] = useState(false);
-
-  const executeSearch = async (v) => {
-    if (v && v && v !== "" && v.length >= 3) {
-      try {
-        setLoading(true);
-        const searchData = await axios.post("/search", {
-          search: v
-        });
-
-        const resultsByType = {
-          payments: [],
-          jobs: [],
-          bills: [],
-          owners: [],
-          vehicles: []
-        };
-
-        searchData.data.hits.hits.forEach((hit) => {
-          resultsByType[hit._index].push(hit._source);
-        });
-        setData([
-          {
-            label: renderTitle(t("menus.header.search.jobs")),
-            options: resultsByType.jobs.map((job) => {
-              return {
-                key: job.id,
-                value: job.ro_number || "N/A",
-                label: (
-                  <Link to={`/manage/jobs/${job.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <strong>{job.ro_number || t("general.labels.na")}</strong>
-                      <span>{`${job.status || ""}`}</span>
-                      <span>
-                        <OwnerNameDisplay ownerObject={job} />
-                      </span>
-                      <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
-                      <span>{`${job.clm_no || ""}`}</span>
-                      <span>{`${job.plate_no || ""}`}</span>
-                    </Space>
-                  </Link>
-                )
-              };
-            })
-          },
-          {
-            label: renderTitle(t("menus.header.search.owners")),
-            options: resultsByType.owners.map((owner) => {
-              return {
-                key: owner.id,
-                value: OwnerNameDisplayFunction(owner),
-                label: (
-                  <Link to={`/manage/owners/${owner.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />} wrap>
-                      <span>
-                        <OwnerNameDisplay ownerObject={owner} />
-                      </span>
-                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
-                    </Space>
-                  </Link>
-                )
-              };
-            })
-          },
-          {
-            label: renderTitle(t("menus.header.search.vehicles")),
-            options: resultsByType.vehicles.map((vehicle) => {
-              return {
-                key: vehicle.id,
-                value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`,
-                label: (
-                  <Link to={`/manage/vehicles/${vehicle.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <span>
-                        {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`}
-                      </span>
-                      <span>{vehicle.plate_no || ""}</span>
-                      <span>
-                        <VehicleVinDisplay>{vehicle.v_vin || ""}</VehicleVinDisplay>
-                      </span>
-                    </Space>
-                  </Link>
-                )
-              };
-            })
-          },
-          {
-            label: renderTitle(t("menus.header.search.payments")),
-            options: resultsByType.payments.map((payment) => {
-              return {
-                key: payment.id,
-                value: `${payment.job?.ro_number} ${payment.amount}`,
-                label: (
-                  <Link to={`/manage/jobs/${payment.job?.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <span>{payment.paymentnum}</span>
-                      <span>{payment.job?.ro_number}</span>
-                      <span>{payment.memo || ""}</span>
-                      <span>{payment.amount || ""}</span>
-                      <span>{payment.transactionid || ""}</span>
-                    </Space>
-                  </Link>
-                )
-              };
-            })
-          },
-          {
-            label: renderTitle(t("menus.header.search.bills")),
-            options: resultsByType.bills.map((bill) => {
-              return {
-                key: bill.id,
-                value: `${bill.invoice_number} - ${bill.vendor.name}`,
-                label: (
-                  <Link to={`/manage/bills?billid=${bill.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <span>{bill.invoice_number}</span>
-                      <span>{bill.vendor.name}</span>
-                      <span>{bill.date}</span>
-                    </Space>
-                  </Link>
-                )
-              };
-            })
-          }
-          // {
-          //   label: renderTitle(t("menus.header.search.phonebook")),
-          //   options: resultsByType.search_phonebook.map((pb) => {
-          //     return {
-          //       key: pb.id,
-          //       value: `${pb.firstname || ""} ${pb.lastname || ""} ${
-          //         pb.company || ""
-          //       }`,
-          //       label: (
-          //         <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
-          //           <Space size="small" split={<Divider type="vertical" />}>
-          //             <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
-          //               pb.company || ""
-          //             }`}</span>
-          //             <PhoneNumberFormatter>{pb.phone1}</PhoneNumberFormatter>
-          //             <span>{pb.email}</span>
-          //           </Space>
-          //         </Link>
-          //       ),
-          //     };
-          //   }),
-          // },
-        ]);
-      } catch (error) {
-        console.log("Error while fetching search results", error);
-      } finally {
-        setLoading(false);
-      }
-    }
-  };
-  const debouncedExecuteSearch = _.debounce(executeSearch, 750);
-
-  const handleSearch = (value) => {
-    debouncedExecuteSearch(value);
-  };
-
-  const renderTitle = (title) => {
-    return <span>{title}</span>;
-  };
-
-  return (
-    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
-      <Input.Search
-        size="large"
-        placeholder={t("general.labels.globalsearch")}
-        enterButton
-        allowClear
-        loading={loading}
-      />
-    </AutoComplete>
-  );
-}

client/src/components/global-search/global-search.component.jsx

@@ -1,26 +1,29 @@
 import { useLazyQuery } from "@apollo/client";
-import { AutoComplete, Divider, Input, Space } from "antd";
+import { LoadingOutlined } from "@ant-design/icons";
+import { AutoComplete, Divider, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { Link, useHistory } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
-import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
-
 export default function GlobalSearch() {
   const { t } = useTranslation();
-  const [callSearch, { loading, error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY);
+  const history = useHistory();
+  const [callSearch, { loading, error, data }] =
+    useLazyQuery(GLOBAL_SEARCH_QUERY);
 
   const executeSearch = (v) => {
-    if (v && v.variables.search && v.variables.search !== "" && v.variables.search.length >= 3) callSearch(v);
+    if (v && v.variables.search && v.variables.search !== "") callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 750);
 
   const handleSearch = (value) => {
-    console.log("Handle Search");
     debouncedExecuteSearch({ variables: { search: value } });
   };
 
@@ -35,7 +38,7 @@ export default function GlobalSearch() {
           options: data.search_jobs.map((job) => {
             return {
               key: job.id,
-              value: job.ro_number || "N/A",
+              value: job.ro_number,
               label: (
                 <Link to={`/manage/jobs/${job.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
@@ -44,13 +47,15 @@ export default function GlobalSearch() {
                     <span>
                       <OwnerNameDisplay ownerObject={job} />
                     </span>
-                    <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
+                    <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
+                      job.v_model_desc || ""
+                    }`}</span>
                     <span>{`${job.clm_no || ""}`}</span>
                   </Space>
                 </Link>
-              )
+              ),
             };
-          })
+          }),
         },
         {
           label: renderTitle(t("menus.header.search.owners")),
@@ -64,35 +69,45 @@ export default function GlobalSearch() {
                     <span>
                       <OwnerNameDisplay ownerObject={owner} />
                     </span>
-                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                      {owner.ownr_ph1}
+                    </PhoneNumberFormatter>
+                    <PhoneNumberFormatter>
+                      {owner.ownr_ph2}
+                    </PhoneNumberFormatter>
                   </Space>
                 </Link>
-              )
+              ),
             };
-          })
+          }),
         },
         {
           label: renderTitle(t("menus.header.search.vehicles")),
           options: data.search_vehicles.map((vehicle) => {
             return {
               key: vehicle.id,
-              value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`,
+              value: `${vehicle.v_model_yr || ""} ${
+                vehicle.v_make_desc || ""
+              } ${vehicle.v_model_desc || ""}`,
               label: (
                 <Link to={`/manage/vehicles/${vehicle.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
                     <span>
-                      {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`}
+                      {`${vehicle.v_model_yr || ""} ${
+                        vehicle.v_make_desc || ""
+                      } ${vehicle.v_model_desc || ""}`}
                     </span>
                     <span>{vehicle.plate_no || ""}</span>
                     <span>
-                      <VehicleVinDisplay>{vehicle.v_vin || ""}</VehicleVinDisplay>
+                      <VehicleVinDisplay>
+                        {vehicle.v_vin || ""}
+                      </VehicleVinDisplay>
                     </span>
                   </Space>
                 </Link>
-              )
+              ),
             };
-          })
+          }),
         },
         {
           label: renderTitle(t("menus.header.search.payments")),
@@ -110,9 +125,9 @@ export default function GlobalSearch() {
                     <span>{payment.transactionid || ""}</span>
                   </Space>
                 </Link>
-              )
+              ),
             };
-          })
+          }),
         },
         {
           label: renderTitle(t("menus.header.search.bills")),
@@ -128,42 +143,48 @@ export default function GlobalSearch() {
                     <span>{bill.date}</span>
                   </Space>
                 </Link>
-              )
+              ),
             };
-          })
+          }),
         },
         {
           label: renderTitle(t("menus.header.search.phonebook")),
           options: data.search_phonebook.map((pb) => {
             return {
               key: pb.id,
-              value: `${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`,
+              value: `${pb.firstname || ""} ${pb.lastname || ""} ${
+                pb.company || ""
+              }`,
               label: (
                 <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
-                    <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`}</span>
+                    <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
+                      pb.company || ""
+                    }`}</span>
                     <PhoneNumberFormatter>{pb.phone1}</PhoneNumberFormatter>
                     <span>{pb.email}</span>
                   </Space>
                 </Link>
-              )
+              ),
             };
-          })
+          }),
-        }
+        },
       ]
     : [];
 
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <AutoComplete options={options} onSearch={handleSearch} defaultActiveFirstOption>
+    <AutoComplete
-      <Input.Search
+      options={options}
-        size="large"
+      onSearch={handleSearch}
-        placeholder={t("general.labels.globalsearch")}
+      suffixIcon={loading && <LoadingOutlined spin />}
-        enterButton
+      defaultActiveFirstOption
-        allowClear
+      placeholder={t("general.labels.globalsearch")}
-        loading={loading}
+      allowClear
-      />
+      onSelect={(val, opt) => {
-    </AutoComplete>
+        history.push(opt.label.props.to);
+      }}
+    ></AutoComplete>
   );
 }

client/src/components/header/header.component.jsx

@@ -1,9 +1,10 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import Icon, {
   BankFilled,
   BarChartOutlined,
   CarFilled,
-  CheckCircleOutlined,
   ClockCircleFilled,
+  CheckCircleOutlined,
   DashboardFilled,
   DollarCircleFilled,
   ExportOutlined,
@@ -13,7 +14,7 @@ import Icon, {
   FileFilled,
   //GlobalOutlined,
   HomeFilled,
-  ImportOutlined, InfoCircleOutlined,
+  ImportOutlined,
   LineChartOutlined,
   PaperClipOutlined,
   PhoneOutlined,
@@ -25,9 +26,8 @@ import Icon, {
   UnorderedListOutlined,
   UserOutlined,
 } from "@ant-design/icons";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import { Layout, Menu } from "antd";
-import {Layout, Menu, Switch, Tooltip} from "antd";
+import React from "react";
-import React, {useEffect, useState} from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import {
@@ -52,7 +52,6 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import {handleBeta, setBeta, checkBeta} from "../../utils/handleBeta";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -71,8 +70,6 @@ const mapDispatchToProps = (dispatch) => ({
   setReportCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "reportCenter" })),
   signOutStart: () => dispatch(signOutStart()),
-  setCardPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
 });
 
 function Header({
@@ -86,7 +83,6 @@ function Header({
   setPaymentContext,
   setReportCenterContext,
   recentItems,
-  setCardPaymentContext,
 }) {
   const { Simple_Inventory } = useTreatments(
     ["Simple_Inventory"],
@@ -98,26 +94,9 @@ function Header({
     {},
     bodyshop && bodyshop.imexshopid
   );
-  const { ImEXPay } = useTreatments(
-    ["ImEXPay"],
-    {},
-    bodyshop && bodyshop.imexshopid
-  );
-  const [betaSwitch, setBetaSwitch] = useState(false);
 
   const { t } = useTranslation();
 
-  useEffect(() => {
-    const isBeta = checkBeta();
-    setBetaSwitch(isBeta);
-  }, []);
-
-  const betaSwitchChange = (checked) => {
-    setBeta(checked);
-    setBetaSwitch(checked);
-    handleBeta();
-  }
-
   return (
     <Layout.Header>
       <Menu
@@ -127,335 +106,428 @@ function Header({
         selectedKeys={[selectedHeader]}
         onClick={handleMenuClick}
         subMenuCloseDelay={0.3}
-      >
+        items={[
-        <Menu.Item key="home" icon={<HomeFilled />}>
-          <Link to="/manage">{t("menus.header.home")}</Link>
-        </Menu.Item>
-        <Menu.Item key="schedule" icon={<Icon component={FaCalendarAlt} />}>
-          <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
-        </Menu.Item>
-        <Menu.SubMenu
-          key="jobssubmenu"
-          icon={<Icon component={FaCarCrash} />}
-          title={t("menus.header.jobs")}
-        >
-          <Menu.Item key="activejobs" icon={<FileFilled />}>
-            <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
-          </Menu.Item>
-          <Menu.Item key="readyjobs" icon={<CheckCircleOutlined />}>
-            <Link to="/manage/jobs/ready">{t("menus.header.readyjobs")}</Link>
-          </Menu.Item>
-          <Menu.Item key="parts-queue" icon={<ToolFilled />}>
-            <Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
-          </Menu.Item>
-          <Menu.Item key="availablejobs" icon={<ImportOutlined />}>
-            <Link to="/manage/available">
-              {t("menus.header.availablejobs")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="newjob" icon={<FileAddOutlined />}>
-            <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
-          </Menu.Item>
-          <Menu.Divider key="div1" />
-          <Menu.Item key="alljobs" icon={<UnorderedListOutlined />}>
-            <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
-          </Menu.Item>
-          <Menu.Divider key="div2" />
-          <Menu.Item key="productionlist" icon={<ScheduleOutlined />}>
-            <Link to="/manage/production/list">
-              {t("menus.header.productionlist")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="productionboard" icon={<Icon component={BsKanban} />}>
-            <Link to="/manage/production/board">
-              {t("menus.header.productionboard")}
-            </Link>
-          </Menu.Item>
-          <Menu.Divider key="div3" />
-          <Menu.Item key="scoreboard" icon={<LineChartOutlined />}>
-            <Link to="/manage/scoreboard">{t("menus.header.scoreboard")}</Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="customers"
-          icon={<UserOutlined />}
-          title={t("menus.header.customers")}
-        >
-          <Menu.Item key="owners" icon={<TeamOutlined />}>
-            <Link to="/manage/owners">{t("menus.header.owners")}</Link>
-          </Menu.Item>
-          <Menu.Item key="vehicles" icon={<CarFilled />}>
-            <Link to="/manage/vehicles">{t("menus.header.vehicles")}</Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="ccs"
-          icon={<CarFilled />}
-          title={t("menus.header.courtesycars")}
-        >
-          <Menu.Item key="courtesycarsall" icon={<CarFilled />}>
-            <Link to="/manage/courtesycars">
-              {t("menus.header.courtesycars-all")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="contracts" icon={<FileFilled />}>
-            <Link to="/manage/courtesycars/contracts">
-              {t("menus.header.courtesycars-contracts")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="newcontract" icon={<FileAddFilled />}>
-            <Link to="/manage/courtesycars/contracts/new">
-              {t("menus.header.courtesycars-newcontract")}
-            </Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="accounting"
-          icon={<DollarCircleFilled />}
-          title={t("menus.header.accounting")}
-        >
-          <Menu.Item
-            key="bills"
-            icon={<Icon component={FaFileInvoiceDollar} />}
-          >
-            <Link to="/manage/bills">{t("menus.header.bills")}</Link>
-          </Menu.Item>
-          <Menu.Item
-            key="enterbills"
-            icon={<Icon component={GiPayMoney} />}
-            onClick={() => {
-              setBillEnterContext({
-                actions: {},
-                context: {},
-              });
-            }}
-          >
-            {t("menus.header.enterbills")}
-          </Menu.Item>
-          {Simple_Inventory.treatment === "on" && (
-            <>
-              <Menu.Divider key="div4" />
-              <Menu.Item
-                key="inventory"
-                icon={<Icon component={FaFileInvoiceDollar} />}
-              >
-                <Link to="/manage/inventory">
-                  {t("menus.header.inventory")}
-                </Link>
-              </Menu.Item>
-            </>
-          )}
-          <Menu.Divider key="div7" />
-          <Menu.Item key="allpayments" icon={<BankFilled />}>
-            <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
-          </Menu.Item>
-          <Menu.Item
-            key="enterpayments"
-            onClick={() => {
-              setPaymentContext({
-                actions: {},
-                context: null,
-              });
-            }}
-            icon={<Icon component={FaCreditCard} />}
-          >
-            {t("menus.header.enterpayment")}
-          </Menu.Item>
-          {ImEXPay.treatment === "on" && (
-            <Menu.Item
-              key="entercardpayments"
-              onClick={() => {
-                setCardPaymentContext({
-                  actions: {},
-                  context: {},
-                });
-              }}
-              icon={<Icon component={FaCreditCard} />}
-            >
-              {t("menus.header.entercardpayment")}
-            </Menu.Item>
-          )}
-          <Menu.Divider key="div5" />
-          <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
-            <Link to="/manage/timetickets">
-              {t("menus.header.timetickets")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item
-            key="entertimetickets"
-            icon={<Icon component={GiPlayerTime} />}
-            onClick={() => {
-              setTimeTicketContext({
-                actions: {},
-                context: {
-                  created_by: currentUser.displayName
-                    ? currentUser.email.concat(" | ", currentUser.displayName)
-                    : currentUser.email,
-                },
-              });
-            }}
-          >
-            {t("menus.header.entertimeticket")}
-          </Menu.Item>
-          <Menu.Divider key="div6" />
-          <Menu.SubMenu
-            key="accountingexport"
-            title={t("menus.header.export")}
-            icon={<ExportOutlined />}
-          >
-            <Menu.Item key="receivables">
-              <Link to="/manage/accounting/receivables">
-                {t("menus.header.accounting-receivables")}
-              </Link>
-            </Menu.Item>
-            {(!(
-              (bodyshop && bodyshop.cdk_dealerid) ||
-              (bodyshop && bodyshop.pbs_serialnumber)
-            ) ||
-              DmsAp.treatment === "on") && (
-              <Menu.Item key="payables">
-                <Link to="/manage/accounting/payables">
-                  {t("menus.header.accounting-payables")}
-                </Link>
-              </Menu.Item>
-            )}
-            {!(
-              (bodyshop && bodyshop.cdk_dealerid) ||
-              (bodyshop && bodyshop.pbs_serialnumber)
-            ) && (
-              <Menu.Item key="payments">
-                <Link to="/manage/accounting/payments">
-                  {t("menus.header.accounting-payments")}
-                </Link>
-              </Menu.Item>
-            )}
-            <Menu.Item key="export-logs">
-              <Link to="/manage/accounting/exportlogs">
-                {t("menus.header.export-logs")}
-              </Link>
-            </Menu.Item>
-          </Menu.SubMenu>
-        </Menu.SubMenu>
-        <Menu.Item key="phonebook" icon={<PhoneOutlined />}>
-          <Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
-        </Menu.Item>
-        <Menu.Item key="temporarydocs" icon={<PaperClipOutlined />}>
-          <Link to="/manage/temporarydocs">
-            {t("menus.header.temporarydocs")}
-          </Link>
-        </Menu.Item>
-        <Menu.SubMenu
-          key="shopsubmenu"
-          title={t("menus.header.shop")}
-          icon={<SettingOutlined />}
-        >
-          <Menu.Item key="shop" icon={<Icon component={GiSettingsKnobs} />}>
-            <Link to="/manage/shop?tab=info">
-              {t("menus.header.shop_config")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="dashboard" icon={<DashboardFilled />}>
-            <Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>
-          </Menu.Item>
-          <Menu.Item
-            key="reportcenter"
-            icon={<BarChartOutlined />}
-            onClick={() => {
-              setReportCenterContext({
-                actions: {},
-                context: {},
-              });
-            }}
-          >
-            {t("menus.header.reportcenter")}
-          </Menu.Item>
-          <Menu.Item
-            key="shop-vendors"
-            icon={<Icon component={IoBusinessOutline} />}
-          >
-            <Link to="/manage/shop/vendors">
-              {t("menus.header.shop_vendors")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="shop-csi" icon={<Icon component={RiSurveyLine} />}>
-            <Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="user"
-          title={
-            currentUser.displayName ||
-            currentUser.email ||
-            t("general.labels.unknown")
-          }
-        >
-          <Menu.Item key="signout" danger onClick={() => signOutStart()}>
-            {t("user.actions.signout")}
-          </Menu.Item>
-          <Menu.Item
-            key="help"
-            onClick={() => {
-              window.open("https://help.imex.online/", "_blank");
-            }}
-            icon={<Icon component={QuestionCircleFilled} />}
-          >
-            {t("menus.header.help")}
-          </Menu.Item>
-          <Menu.Item
-            key="rescue"
-            onClick={() => {
-              window.open("https://imexrescue.com/", "_blank");
-            }}
-          >
-            {t("menus.header.rescueme")}
-          </Menu.Item>
-          <Menu.Item key="shiftclock">
-            <Link to="/manage/shiftclock">{t("menus.header.shiftclock")}</Link>
-          </Menu.Item>
-          <Menu.Item key="profile">
-            <Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
-          </Menu.Item>
           {
-            //  <Menu.SubMenu
+            key: "home",
-            //           key="langselecter"
+            icon: <HomeFilled />,
-            //           title={
+            label: <Link to="/manage">{t("menus.header.home")}</Link>,
-            //             <span>
+          },
-            //               <GlobalOutlined />
+          {
-            //               <span>{t("menus.currentuser.languageselector")}</span>
+            key: "schedule",
-            //             </span>
+            icon: <Icon component={FaCalendarAlt} />,
-            //           }
+            label: (
-            //         >
+              <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
-            //           <Menu.Item actiontype="lang-select" key="en-US">
+            ),
-            //             {t("general.languages.english")}
+          },
-            //           </Menu.Item>
+          {
-            //           <Menu.Item actiontype="lang-select" key="fr-CA">
+            key: "jobssubmenu",
-            //             {t("general.languages.french")}
+            icon: <Icon component={FaCarCrash} />,
-            //           </Menu.Item>
+            label: t("menus.header.jobs"),
-            //           <Menu.Item actiontype="lang-select" key="es-MX">
+            children: [
-            //             {t("general.languages.spanish")}
+              {
-            //           </Menu.Item>
+                key: "activejobs",
-            //         </Menu.SubMenu>
+                icon: <FileFilled />,
-          }
+                label: (
-        </Menu.SubMenu>
+                  <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
-        <Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
+                ),
-          {recentItems.map((i, idx) => (
+              },
-            <Menu.Item key={idx}>
+              {
-              <Link to={i.url}>{i.label}</Link>
+                key: "readyjobs",
-            </Menu.Item>
+                icon: <CheckCircleOutlined />,
-          ))}
+                label: (
-        </Menu.SubMenu>
+                  <Link to="/manage/jobs/ready">
-        <Menu.Item style={{marginLeft: 'auto'}} key="profile">
+                    {t("menus.header.readyjobs")}
-          <Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
+                  </Link>
-            <InfoCircleOutlined/>
+                ),
-            <span style={{marginRight: 8}}>Try the new ImEX Online</span>
+              },
-            <Switch
+              {
-                checked={betaSwitch}
+                key: "parts-queue",
-                onChange={betaSwitchChange}
+                icon: <ToolFilled />,
-            />
+                label: (
-          </Tooltip>
+                  <Link to="/manage/partsqueue">
-        </Menu.Item>
+                    {t("menus.header.parts-queue")}
+                  </Link>
+                ),
+              },
+              {
+                key: "availablejobs",
+                icon: <ImportOutlined />,
+                label: (
+                  <Link to="/manage/available">
+                    {t("menus.header.availablejobs")}
+                  </Link>
+                ),
+              },
+              {
+                key: "newjob",
+                icon: <FileAddOutlined />,
+                label: (
+                  <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
+                ),
+              },
+              { type: "divider" },
+              {
+                key: "alljobs",
+                icon: <UnorderedListOutlined />,
+                label: (
+                  <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
+                ),
+              },
+              { type: "divider" },
+              {
+                key: "productionlist",
+                icon: <ScheduleOutlined />,
+                label: (
+                  <Link to="/manage/production/list">
+                    {t("menus.header.productionlist")}
+                  </Link>
+                ),
+              },
+              {
+                key: "productionboard",
+                icon: <Icon component={BsKanban} />,
+                label: (
+                  <Link to="/manage/production/board">
+                    {t("menus.header.productionboard")}
+                  </Link>
+                ),
+              },
+              {
+                type: "divider",
+              },
+              {
+                key: "scoreboard",
+                icon: <LineChartOutlined />,
+                label: (
+                  <Link to="/manage/scoreboard">
+                    {t("menus.header.scoreboard")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "customers",
+            icon: <UserOutlined />,
+            label: t("menus.header.customers"),
+            children: [
+              {
+                key: "owners",
+                icon: <TeamOutlined />,
+                label: (
+                  <Link to="/manage/owners">{t("menus.header.owners")}</Link>
+                ),
+              },
+              {
+                key: "vehicles",
+                icon: <CarFilled />,
+                label: (
+                  <Link to="/manage/vehicles">
+                    {t("menus.header.vehicles")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "ccs",
+            icon: <CarFilled />,
+            label: t("menus.header.courtesycars"),
+            children: [
+              {
+                key: "courtesycarsall",
+                icon: <CarFilled />,
+                label: (
+                  <Link to="/manage/courtesycars">
+                    {t("menus.header.courtesycars-all")}
+                  </Link>
+                ),
+              },
+              {
+                key: "contracts",
+                icon: <FileFilled />,
+                label: (
+                  <Link to="/manage/courtesycars/contracts">
+                    {t("menus.header.courtesycars-contracts")}
+                  </Link>
+                ),
+              },
+              {
+                key: "newcontract",
+                icon: <FileAddFilled />,
+                label: (
+                  <Link to="/manage/courtesycars/contracts/new">
+                    {t("menus.header.courtesycars-newcontract")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "accounting",
+            icon: <DollarCircleFilled />,
+            label: t("menus.header.accounting"),
+            children: [
+              {
+                key: "bills",
+                icon: <Icon component={FaFileInvoiceDollar} />,
+                label: (
+                  <Link to="/manage/bills">{t("menus.header.bills")}</Link>
+                ),
+              },
+              {
+                key: "enterbills",
+                icon: <Icon component={GiPayMoney} />,
+                onClick: () => {
+                  setBillEnterContext({
+                    actions: {},
+                    context: {},
+                  });
+                },
+                label: t("menus.header.enterbills"),
+              },
+              ...(Simple_Inventory.treatment === "on"
+                ? [
+                    {
+                      type: "divider",
+                    },
+                    {
+                      key: "inventory",
+                      icon: <Icon component={FaFileInvoiceDollar} />,
+                      label: (
+                        <Link to="/manage/inventory">
+                          {t("menus.header.inventory")}
+                        </Link>
+                      ),
+                    },
+                  ]
+                : []),
+              { type: "divider" },
+              {
+                key: "allpayments",
+                icon: <BankFilled />,
+                label: (
+                  <Link to="/manage/payments">
+                    {t("menus.header.allpayments")}
+                  </Link>
+                ),
+              },
+              {
+                key: "enterpayments",
+                onClick: () => {
+                  setPaymentContext({
+                    actions: {},
+                    context: null,
+                  });
+                },
+                icon: <Icon component={FaCreditCard} />,
+                label: t("menus.header.enterpayment"),
+              },
+              { type: "divider" },
+              {
+                key: "timetickets",
+                icon: <FieldTimeOutlined />,
+                label: (
+                  <Link to="/manage/timetickets">
+                    {t("menus.header.timetickets")}
+                  </Link>
+                ),
+              },
+              {
+                key: "entertimetickets",
+                icon: <Icon component={GiPlayerTime} />,
+                onClick: () => {
+                  setTimeTicketContext({
+                    actions: {},
+                    context: {},
+                  });
+                },
+                label: t("menus.header.entertimeticket"),
+              },
+              { type: "divider" },
+              {
+                key: "accountingexport",
+                icon: <ExportOutlined />,
 
-      </Menu>
+                label: t("menus.header.export"),
+                children: [
+                  {
+                    key: "receivables",
+                    label: (
+                      <Link to="/manage/accounting/receivables">
+                        {t("menus.header.accounting-receivables")}
+                      </Link>
+                    ),
+                  },
+                  ...(!(
+                    (bodyshop && bodyshop.cdk_dealerid) ||
+                    (bodyshop && bodyshop.pbs_serialnumber)
+                  ) || DmsAp.treatment === "on"
+                    ? [
+                        {
+                          key: "payables",
+                          label: (
+                            <Link to="/manage/accounting/payables">
+                              {t("menus.header.accounting-payables")}
+                            </Link>
+                          ),
+                        },
+                      ]
+                    : []),
+
+                  ...(!(
+                    (bodyshop && bodyshop.cdk_dealerid) ||
+                    (bodyshop && bodyshop.pbs_serialnumber)
+                  )
+                    ? [
+                        {
+                          key: "payments",
+                          label: (
+                            <Link to="/manage/accounting/payments">
+                              {t("menus.header.accounting-payments")}
+                            </Link>
+                          ),
+                        },
+                      ]
+                    : []),
+                  {
+                    key: "export-logs",
+                    label: (
+                      <Link to="/manage/accounting/exportlogs">
+                        {t("menus.header.export-logs")}
+                      </Link>
+                    ),
+                  },
+                ],
+              },
+            ],
+          },
+
+          {
+            key: "phonebook",
+            icon: <PhoneOutlined />,
+            label: (
+              <Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
+            ),
+          },
+          {
+            key: "temporarydocs",
+            icon: <PaperClipOutlined />,
+            label: (
+              <Link to="/manage/temporarydocs">
+                {t("menus.header.temporarydocs")}
+              </Link>
+            ),
+          },
+
+          {
+            key: "shopsubmenu",
+            icon: <SettingOutlined />,
+            label: t("menus.header.shop"),
+            children: [
+              {
+                key: "shop",
+                icon: <Icon component={GiSettingsKnobs} />,
+                label: (
+                  <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
+                ),
+              },
+              {
+                key: "dashboard",
+                icon: <DashboardFilled />,
+                label: (
+                  <Link to="/manage/dashboard">
+                    {t("menus.header.dashboard")}
+                  </Link>
+                ),
+              },
+              {
+                key: "reportcenter",
+                icon: <BarChartOutlined />,
+                onClick: () => {
+                  setReportCenterContext({
+                    actions: {},
+                    context: {},
+                  });
+                },
+                label: t("menus.header.reportcenter"),
+              },
+              {
+                key: "shop-vendors",
+                icon: <Icon component={IoBusinessOutline} />,
+                label: (
+                  <Link to="/manage/shop/vendors">
+                    {t("menus.header.shop_vendors")}
+                  </Link>
+                ),
+              },
+              {
+                key: "shop-csi",
+                icon: <Icon component={RiSurveyLine} />,
+                label: (
+                  <Link to="/manage/shop/csi">
+                    {t("menus.header.shop_csi")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "user",
+            label:
+              currentUser.displayName ||
+              currentUser.email ||
+              t("general.labels.unknown"),
+            children: [
+              {
+                key: "signout",
+                danger: true,
+                onClick: () => signOutStart(),
+                label: t("user.actions.signout"),
+              },
+              {
+                key: "help",
+                icon: <Icon component={QuestionCircleFilled} />,
+                onClick: () => {
+                  window.open("https://help.imex.online/", "_blank");
+                },
+                label: t("menus.header.help"),
+              },
+              {
+                key: "rescue",
+                onClick: () => {
+                  window.open("https://imexrescue.com/", "_blank");
+                },
+                label: t("menus.header.rescueme"),
+              },
+              {
+                key: "shiftclock",
+                label: (
+                  <Link to="/manage/shiftclock">
+                    {t("menus.header.shiftclock")}
+                  </Link>
+                ),
+              },
+              {
+                key: "profile",
+                label: (
+                  <Link to="/manage/profile">
+                    {t("menus.currentuser.profile")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "recent",
+            label: <ClockCircleFilled />,
+            children: recentItems.map((i, idx) => ({
+              key: idx,
+              label: <Link to={i.url}>{i.label}</Link>,
+            })),
+          },
+        ]}
+      ></Menu>
     </Layout.Header>
   );
 }

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

@@ -11,7 +11,6 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InventoryBillRo from "../inventory-bill-ro/inventory-bill-ro.component";
 import InventoryLineDelete from "../inventory-line-delete/inventory-line-delete.component";
-import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -214,7 +213,7 @@ export function JobsList({
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: pageLimit,
+          pageSize: 25,
           current: parseInt(page || 1),
           total: total,
         }}

client/src/components/inventory-list/inventory-list.container.jsx

@@ -11,7 +11,6 @@ import {
 } from "../../redux/application/application.actions";
 import AlertComponent from "../alert/alert.component";
 import InventoryListPaginated from "./inventory-list.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //bodyshop: selectBodyshop,
@@ -33,8 +32,8 @@ export function InventoryList({ setBreadcrumbs, setSelectedHeader }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
+        offset: page ? (page - 1) * 25 : 0,
-        limit: pageLimit,
+        limit: 25,
         consumedIsNull: showall === "true" ? null : true,
         order: [
           {

client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx

@@ -103,7 +103,7 @@ export function InventoryUpsertModalContainer({
           ? t("inventory.actions.edit")
           : t("inventory.actions.new")
       }
-      visible={visible}
+      open={visible}
       okText={t("general.actions.save")}
       onOk={() => {
         form.submit();

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { SEARCH_VENDOR_AUTOCOMPLETE_WITH_ADDR } from "../../graphql/vendors.queries";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -14,14 +13,13 @@ import VendorSearchSelect from "../vendor-search-select/vendor-search-select.com
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(Jobd3RdPartyModal);
 
-export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
+export function Jobd3RdPartyModal({ bodyshop, jobId, job }) {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const { t } = useTranslation();
   const [form] = Form.useForm();
@@ -98,7 +96,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
   return (
     <>
       <Button onClick={showModal}>{t("printcenter.jobs.3rdpartypayer")}</Button>
-      <Modal visible={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
+      <Modal open={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
         <Form
           onFinish={handleFinish}
           autoComplete={"off"}
@@ -214,9 +212,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
             ]}
           >
             <Radio.Group>
-              {!technician ? (
+              <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
-                <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
-              ) : null}
               <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
             </Radio.Group>
           </Form.Item>

client/src/components/job-at-change/job-at-change.component.jsx

@@ -1,11 +1,11 @@
-import React from "react";
+import { DownOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { Dropdown, notification } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { Dropdown, Menu, notification } from "antd";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { DownOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
@@ -37,18 +37,19 @@ export function JobAltTransportChange({ bodyshop, job }) {
       });
     }
   };
-  const menu = (
+  const menu = [
-    <Menu selectedKeys={[job && job.alt_transport]} onClick={onClick}>
+    ...(bodyshop.appt_alt_transport &&
-      {bodyshop.appt_alt_transport &&
+      bodyshop.appt_alt_transport.map((alt) => ({
-        bodyshop.appt_alt_transport.map((alt) => (
+        key: alt,
-          <Menu.Item key={alt}>{alt}</Menu.Item>
+        label: alt,
-        ))}
+        value: alt,
-      <Menu.Divider />
+        onClick,
-      <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
+      }))),
-    </Menu>
+    { type: "divider" },
-  );
+    { key: "null", label: t("general.actions.clear"), onClick },
+  ];
   return (
-    <Dropdown overlay={menu}>
+    <Dropdown menu={{ items: menu }}>
       <a href=" #" onClick={(e) => e.preventDefault()}>
         <DownOutlined />
       </a>

client/src/components/job-at-change/schedule-event.color.component.jsx

@@ -1,11 +1,11 @@
-import React from "react";
+import { DownOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import { Dropdown, notification } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { Dropdown, Menu, notification } from "antd";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
-import { DownOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
@@ -44,21 +44,23 @@ export function ScheduleEventColor({ bodyshop, event }) {
     bodyshop.appt_colors.filter((color) => color.color.hex === event.color)[0]
       ?.label;
 
-  const menu = (
+  const menu = {
-    <Menu selectedKeys={[event.color]} onClick={onClick}>
+    items: [
-      {bodyshop.appt_colors &&
+      ...(bodyshop.appt_colors &&
-        bodyshop.appt_colors.map((color) => (
+        bodyshop.appt_colors.map((color) => ({
-          <Menu.Item style={{ color: color.color.hex }} key={color.color.hex}>
+          style: { color: color.color.hex },
-            {color.label}
+          key: color.color.hex,
-          </Menu.Item>
+          label: color.label,
-        ))}
+        }))),
-      <Menu.Divider />
+      { type: "divider" },
-      <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
+      { key: "null", value: t("general.actions.clear") },
-    </Menu>
+    ],
-  );
+    selectedKeys: [event.color],
+    onClick: onClick,
+  };
 
   return (
-    <Dropdown overlay={menu}>
+    <Dropdown menu={menu}>
       <a href=" #" onClick={(e) => e.preventDefault()}>
         {selectedColor}
         <DownOutlined />

client/src/components/job-at-change/schedule-event.component.jsx

@@ -2,14 +2,9 @@ import { AlertFilled } from "@ant-design/icons";
 import {
   Button,
   Divider,
-  Dropdown,
+  Dropdown, notification,
-  Form,
-  Input,
-  Menu,
-  notification,
   Popover,
-  Select,
+  Space
-  Space,
 } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import moment from "moment";
@@ -21,7 +16,7 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import {
   openChatByPhone,
-  setMessage,
+  setMessage
 } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -35,8 +30,6 @@ import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import { useMutation } from "@apollo/client";
-import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -61,44 +54,13 @@ export function ScheduleEventComponent({
   const [visible, setVisible] = useState(false);
   const history = useHistory();
   const searchParams = queryString.parse(useLocation().search);
-  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
-  const [title, setTitle] = useState(event.title);
-  const blockContent = (
-    <Space direction="vertical" wrap>
-      <Input
-        value={title}
-        onChange={(e) => setTitle(e.currentTarget.value)}
-        onBlur={async () => {
-          await updateAppointment({
-            variables: {
-              appid: event.id,
-              app: {
-                title: title,
-              },
-            },
-            optimisticResponse: {
-              update_appointments: {
-                __typename: "appointments_mutation_response",
-                returning: [
-                  {
-                    ...event,
-                    title: title,
-                    __typename: "appointments",
-                  },
-                ],
-              },
-            },
-          });
-        }}
-      />
 
-      <Button
+  const blockContent = (
-        onClick={() => handleCancel({ id: event.id })}
+    <div>
-        disabled={event.arrived}
+      <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
-      >
+        {t("appointments.actions.cancel")}
-        {t("appointments.actions.unblock")}
       </Button>
-    </Space>
+    </div>
   );
 
   const popoverContent = (
@@ -185,10 +147,12 @@ export function ScheduleEventComponent({
         ) : null}
         {event.job ? (
           <Dropdown
-            overlay={
+            menu={{
-              <Menu>
+              items: [
-                <Menu.Item
+                {
-                  onClick={() => {
+                  disabled: event.arrived,
+                  label: t("general.labels.email"),
+                  onClick: () => {
                     const Template = TemplateList("job").appointment_reminder;
                     GenerateDocument(
                       {
@@ -202,13 +166,12 @@ export function ScheduleEventComponent({
                       "e",
                       event.job && event.job.id
                     );
-                  }}
+                  },
-                  disabled={event.arrived}
+                },
-                >
+                {
-                  {t("general.labels.email")}
+                  label: t("general.labels.sms"),
-                </Menu.Item>
+                  disabled: event.arrived || !bodyshop.messagingservicesid,
-                <Menu.Item
+                  onClick: () => {
-                  onClick={() => {
                     const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
                     if (p && p.isValid()) {
                       openChatByPhone({
@@ -228,67 +191,18 @@ export function ScheduleEventComponent({
                         message: t("messaging.error.invalidphone"),
                       });
                     }
-                  }}
+                  },
-                  disabled={event.arrived || !bodyshop.messagingservicesid}
+                },
-                >
+              ],
-                  {t("general.labels.sms")}
+            }}
-                </Menu.Item>
-              </Menu>
-            }
           >
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
-        {event.arrived ? (
-          <Button
-            // onClick={() => handleCancel(event.id)}
-            disabled={event.arrived}
-          >
-            {t("appointments.actions.cancel")}
-          </Button>
-        ) : (
-          <Popover
-            trigger="click"
-            disabled={event.arrived}
-            content={
-              <Form
-                layout="vertical"
-                onFinish={({ lost_sale_reason }) => {
-                  handleCancel({ id: event.id, lost_sale_reason });
-                }}
-              >
-                <Form.Item
-                  name="lost_sale_reason"
-                  label={t("jobs.fields.lost_sale_reason")}
-                  rules={[
-                    {
-                      required: true,
-                      //message: t("general.validation.required"),
-                    },
-                  ]}
-                >
-                  <Select
-                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                      label: lsr,
-                      value: lsr,
-                    }))}
-                  />
-                </Form.Item>
-                <Button htmlType="submit">
-                  {t("appointments.actions.cancel")}
-                </Button>
-              </Form>
-            }
-          >
-            <Button
-              // onClick={() => handleCancel(event.id)}
-              disabled={event.arrived}
-            >
-              {t("appointments.actions.cancel")}
-            </Button>
-          </Popover>
-        )}
 
+        <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
+          {t("appointments.actions.cancel")}
+        </Button>
         {event.isintake ? (
           <Button
             disabled={event.arrived}
@@ -369,8 +283,8 @@ export function ScheduleEventComponent({
 
   return (
     <Popover
-      visible={visible}
+      open={visible}
-      onVisibleChange={(vis) => !event.vacation && setVisible(vis)}
+      onOpenChange={(vis) => !event.vacation && setVisible(vis)}
       trigger="click"
       content={event.block ? blockContent : popoverContent}
       style={{

client/src/components/job-at-change/schedule-event.container.jsx

@@ -2,20 +2,16 @@ import { useMutation } from "@apollo/client";
 import { notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENT_BY_ID } from "../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import ScheduleEventComponent from "./schedule-event.component";
 
 export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
-  const dispatch = useDispatch();
   const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
   const [updateJob] = useMutation(UPDATE_JOB);
-  const handleCancel = async ({ id, lost_sale_reason }) => {
+  const handleCancel = async (id) => {
     logImEXEvent("schedule_cancel_appt");
 
     const cancelAppt = await cancelAppointment({
@@ -38,25 +34,15 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
       const jobUpdate = await updateJob({
         variables: {
           jobId: event.job.id,
+
           job: {
             date_scheduled: null,
             scheduled_in: null,
-            scheduled_completion: null,
+            scheduled_completion:null,
-            lost_sale_reason,
-            date_lost_sale: new Date(),
             status: bodyshop.md_ro_statuses.default_imported,
           },
         },
       });
-      if (!jobUpdate.errors) {
-        dispatch(
-          insertAuditTrail({
-            jobid: event.job.id,
-            operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
-            type: "appointmentcancel",
-          })
-        );
-      }
       if (!!jobUpdate.errors) {
         notification["error"]({
           message: t("jobs.errors.updating", {

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -1,6 +1,5 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, notification, Switch } from "antd";
-import moment from "moment-business-days";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,23 +12,24 @@ import {
   MARK_LATEST_APPOINTMENT_ARRIVED,
 } from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
-import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
-import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../../../redux/user/user.selectors";
-import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
+import moment from "moment-business-days";
+import { insertAuditTrail } from "../../../../redux/application/application.actions";
+import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
+  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobChecklistForm({
@@ -183,7 +183,6 @@ export function JobChecklistForm({
           (type === "intake" && bodyshop.md_ro_statuses.default_arrived) ||
             (type === "deliver" && bodyshop.md_ro_statuses.default_delivered)
         ),
-        type: "jobchecklist",
       });
     } else {
       notification["error"]({
@@ -231,7 +230,6 @@ export function JobChecklistForm({
                 )),
             scheduled_delivery:
               job.scheduled_delivery && moment(job.scheduled_delivery),
-            production_vars: job.production_vars,
           }),
           ...(type === "deliver" && {
             removeFromProduction: true,

client/src/components/job-costing-modal/job-costing-modal.container.jsx

@@ -39,7 +39,7 @@ export function JobCostingModalContainer({
 
   return (
     <Modal
-      visible={visible}
+    open={visible}
       title={t("jobs.labels.jobcosting")}
       onOk={() => {
         toggleModalVisible();