Pagination Fix

.circleci/config.yml

@@ -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:
@@ -159,4 +177,4 @@ workflows:
       #- admin-app-build:
       #filters:
       #branches:
-      #only: master
+      #only: master

.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,
-};

_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.production

@@ -1,4 +1,4 @@
-GENERATE_SOURCEMAP=true
+GENERATE_SOURCEMAP=false
 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,25 +1,25 @@
 // 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,
+    {
+      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"],
-    //   },
-    // },
+        // webpack-specific configuration
+        include: ".",
+        ignore: ["node_modules", "webpack.config.js"],
+      },
+    },
     {
       plugin: CracoLessPlugin,
       options: {

client/package-lock.json

@@ -13,14 +13,12 @@
         "@craco/craco": "^7.0.0",
         "@fingerprintjs/fingerprintjs": "^3.4.2",
         "@jsreport/browser-client": "^3.1.0",
-        "@sentry/cli": "^2.27.0",
-        "@sentry/react": "^7.99.0",
+        "@sentry/react": "^7.40.0",
         "@sentry/tracing": "^7.40.0",
         "@splitsoftware/splitio-react": "^1.8.1",
         "@tanem/react-nprogress": "^5.0.8",
         "antd": "^4.24.8",
         "apollo-link-logger": "^2.0.1",
-        "apollo-link-sentry": "^3.3.0",
         "axios": "^1.3.4",
         "craco-less": "^2.0.0",
         "dinero.js": "^1.9.1",
@@ -4216,195 +4214,40 @@
       "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==",
       "license": "MIT"
     },
-    "node_modules/@sentry-internal/feedback": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-7.99.0.tgz",
-      "integrity": "sha512-exIO1o+bE0MW4z30FxC0cYzJ4ZHSMlDPMHCBDPzU+MWGQc/fb8s58QUrx5Dnm6HTh9G3H+YlroCxIo9u0GSwGQ==",
-      "dependencies": {
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
-      "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
-      "dependencies": {
-        "@sentry/types": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-7.99.0.tgz",
-      "integrity": "sha512-PoIkfusToDq0snfl2M6HJx/1KJYtXxYhQplrn11kYadO04SdG0XGXf4h7wBTMEQ7LDEAtQyvsOu4nEQtTO3YjQ==",
-      "dependencies": {
-        "@sentry/core": "7.99.0",
-        "@sentry/replay": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
-      "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
-      "dependencies": {
-        "@sentry/types": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/tracing": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.99.0.tgz",
-      "integrity": "sha512-z3JQhHjoM1KdM20qrHwRClKJrNLr2CcKtCluq7xevLtXHJWNAQQbafnWD+Aoj85EWXBzKt9yJMv2ltcXJ+at+w==",
-      "dependencies": {
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/tracing/node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
-      "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/tracing/node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/tracing/node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
-      "dependencies": {
-        "@sentry/types": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@sentry/browser": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.99.0.tgz",
-      "integrity": "sha512-bgfoUv3wkwwLgN5YUOe0ibB3y268ZCnamZh6nLFqnY/UBKC1+FXWFdvzVON/XKUm62LF8wlpCybOf08ebNj2yg==",
+      "version": "7.40.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.40.0.tgz",
+      "integrity": "sha512-07rZ+cTcpmYB1r84/oZtmSPJJvLCxW8yIh/5s4MdKRyZpqIDKhOz6cCS/4j+l1V+MeLcNLZBjFtNdKA2eocTpg==",
+      "license": "MIT",
       "dependencies": {
-        "@sentry-internal/feedback": "7.99.0",
-        "@sentry-internal/replay-canvas": "7.99.0",
-        "@sentry-internal/tracing": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/replay": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry/core": "7.40.0",
+        "@sentry/replay": "7.40.0",
+        "@sentry/types": "7.40.0",
+        "@sentry/utils": "7.40.0",
+        "tslib": "^1.9.3"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@sentry/browser/node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
-      "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/browser/node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/browser/node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
-      "dependencies": {
-        "@sentry/types": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/@sentry/browser/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
     },
     "node_modules/@sentry/cli": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.27.0.tgz",
-      "integrity": "sha512-pc0opd71W8lGhYvmB1keQtJkarxzCS9f9ErKYv6TfXOOX6drvwkyA6vD/6xEnpzyvqGAuGRU4T4sEeLD3irwUQ==",
+      "version": "1.74.6",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.74.6.tgz",
+      "integrity": "sha512-pJ7JJgozyjKZSTjOGi86chIngZMLUlYt2HOog+OJn+WGvqEkVymu8m462j1DiXAnex9NspB4zLLNuZ/R6rTQHg==",
+      "dev": true,
       "hasInstallScript": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "https-proxy-agent": "^5.0.0",
+        "mkdirp": "^0.5.5",
         "node-fetch": "^2.6.7",
+        "npmlog": "^4.1.2",
         "progress": "^2.0.3",
         "proxy-from-env": "^1.1.0",
         "which": "^2.0.2"
@@ -4413,124 +4256,7 @@
         "sentry-cli": "bin/sentry-cli"
       },
       "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "@sentry/cli-darwin": "2.27.0",
-        "@sentry/cli-linux-arm": "2.27.0",
-        "@sentry/cli-linux-arm64": "2.27.0",
-        "@sentry/cli-linux-i686": "2.27.0",
-        "@sentry/cli-linux-x64": "2.27.0",
-        "@sentry/cli-win32-i686": "2.27.0",
-        "@sentry/cli-win32-x64": "2.27.0"
-      }
-    },
-    "node_modules/@sentry/cli-darwin": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.27.0.tgz",
-      "integrity": "sha512-/DOZlN5rK19g7YP2OaVNauQhUrRfJ88RDr6qURFiqdxYHDc3isPFGHZJmeZBTwOnDDepyZb4XLaOyfwvAOxHig==",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-arm": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.27.0.tgz",
-      "integrity": "sha512-JmMQ9zgFhkZUEN5WIYuJisu4Jif/ThRHDjbsbXBRbUkkgRn88hgUfg299djMvlZZxjpl3K9AEua+1TIUeQd0Sg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-arm64": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.27.0.tgz",
-      "integrity": "sha512-f+zuB9XGfB8pNamNgSDhqsavuLuzi6saZxbr3uQf30bA5AESI5hspOd1zPcidOORCVZxiPzQe3+T7avBI1XLuw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-i686": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.27.0.tgz",
-      "integrity": "sha512-/4eyz7jnYp20mZqNtpvCEBkxFW0nEjEZRo2BiASQ5/7K8CmoJRe1vhpDA0WOfzi1zTFIfpdE1/RZm2CjHS6DHQ==",
-      "cpu": [
-        "x86",
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-x64": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.27.0.tgz",
-      "integrity": "sha512-ptu7wXecnYssihzHlxEOaqbFHWmNEfbepBKGXTdWK2kC+D51+7yHsR9xRdThwVID1bisFgjAveKmBQjmKuXjHQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-win32-i686": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.27.0.tgz",
-      "integrity": "sha512-Db4/xmdE5qV4Aq7Yc8vRw22Y46JJdGMdsMsl5jIf0GVSQPgO23O/2uTiDGpPOdeq91K9EtvpH1zQfDLIfLMaXw==",
-      "cpu": [
-        "x86",
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-win32-x64": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.27.0.tgz",
-      "integrity": "sha512-q7y/BH4iGfs0TD5PXh2Q8oqnTbOIufoT1NWJcKqvZcOiqCLK3PNUiq7xUeX1PMTrFYAh3Bm6EekOnMavqvbGmg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
+        "node": ">= 8"
       }
     },
     "node_modules/@sentry/core": {
@@ -4554,15 +4280,16 @@
       "license": "0BSD"
     },
     "node_modules/@sentry/react": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.99.0.tgz",
-      "integrity": "sha512-RtHwgzMHJhzJfSQpVG0SDPQYMTGDX3Q37/YWI59S4ALMbSW4/F6n/eQAvGVYZKbh2UCSqgFuRWaXOYkSZT17wA==",
+      "version": "7.40.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.40.0.tgz",
+      "integrity": "sha512-7yYagpOCdsXnVTtLL8Y7wAf2xXgsk2ncuju3O/G4kEckkLewZWmQeoknOSGFlAgVdGNhTaXc2WGzgOiBMOkhug==",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/browser": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0",
-        "hoist-non-react-statics": "^3.3.2"
+        "@sentry/browser": "7.40.0",
+        "@sentry/types": "7.40.0",
+        "@sentry/utils": "7.40.0",
+        "hoist-non-react-statics": "^3.3.2",
+        "tslib": "^1.9.3"
       },
       "engines": {
         "node": ">=8"
@@ -4571,82 +4298,26 @@
         "react": "15.x || 16.x || 17.x || 18.x"
       }
     },
-    "node_modules/@sentry/react/node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
-      "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/react/node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/react/node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
-      "dependencies": {
-        "@sentry/types": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/@sentry/react/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
     },
     "node_modules/@sentry/replay": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.99.0.tgz",
-      "integrity": "sha512-gyN/I2WpQrLAZDT+rScB/0jnFL2knEVBo8U8/OVt8gNP20Pq8T/rDZKO/TG0cBfvULDUbJj2P4CJryn2p/O2rA==",
+      "version": "7.40.0",
+      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.40.0.tgz",
+      "integrity": "sha512-Y9Kvo9jKouUdrHQhHVv5SmWZClF5o7BFI6oVpLlv4zXORPQlyoZONM/9sxiMvvH73alDSpxzCoxyhlypAOH4ww==",
+      "license": "MIT",
       "dependencies": {
-        "@sentry-internal/tracing": "7.99.0",
-        "@sentry/core": "7.99.0",
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
+        "@sentry/core": "7.40.0",
+        "@sentry/types": "7.40.0",
+        "@sentry/utils": "7.40.0"
       },
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@sentry/replay/node_modules/@sentry/core": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz",
-      "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==",
-      "dependencies": {
-        "@sentry/types": "7.99.0",
-        "@sentry/utils": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/replay/node_modules/@sentry/types": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz",
-      "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/replay/node_modules/@sentry/utils": {
-      "version": "7.99.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz",
-      "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==",
-      "dependencies": {
-        "@sentry/types": "7.99.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@sentry/tracing": {
       "version": "7.40.0",
       "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.40.0.tgz",
@@ -4710,27 +4381,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@sentry/webpack-plugin/node_modules/@sentry/cli": {
-      "version": "1.77.3",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.77.3.tgz",
-      "integrity": "sha512-c3eDqcDRmy4TFz2bFU5Y6QatlpoBPPa8cxBooaS4aMQpnIdLYPF1xhyyiW0LQlDUNc3rRjNF7oN5qKoaRoMTQQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "https-proxy-agent": "^5.0.0",
-        "mkdirp": "^0.5.5",
-        "node-fetch": "^2.6.7",
-        "progress": "^2.0.3",
-        "proxy-from-env": "^1.1.0",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "sentry-cli": "bin/sentry-cli"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@sinclair/typebox": {
       "version": "0.24.51",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
@@ -6462,21 +6112,12 @@
         "@apollo/client": "^3.0.0"
       }
     },
-    "node_modules/apollo-link-sentry": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/apollo-link-sentry/-/apollo-link-sentry-3.3.0.tgz",
-      "integrity": "sha512-wLffWmo5sRw3rHN1Ck6azM0oxObvtaBBf3AC8cLX4SxhyjmkRIagGDji6CFkyAhxupPz0b9/H1u4Ocx+63lNug==",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "dot-prop": "^6.0.0",
-        "tslib": "^2.0.3",
-        "zen-observable-ts": "^1.2.5"
-      },
-      "peerDependencies": {
-        "@apollo/client": "^3.2.3",
-        "@sentry/browser": "^7.41.0",
-        "graphql": "15 - 16"
-      }
+    "node_modules/aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/arch": {
       "version": "2.2.0",
@@ -6499,6 +6140,17 @@
       ],
       "license": "MIT"
     },
+    "node_modules/are-we-there-yet": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
@@ -7919,6 +7571,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@@ -8081,6 +7743,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -9242,6 +8911,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/denque": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
@@ -9542,28 +9218,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
-      "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/dot-prop/node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dotenv": {
       "version": "16.0.1",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
@@ -10810,8 +10464,6 @@
     },
     "node_modules/eventemitter2": {
       "version": "6.4.7",
-      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
-      "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
       "dev": true,
       "license": "MIT"
     },
@@ -11631,6 +11283,74 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "node_modules/gauge/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gauge/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -12033,6 +11753,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -16017,6 +15744,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -16029,6 +15769,16 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/nwsapi": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz",
@@ -18044,6 +17794,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -20775,6 +20526,13 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -22352,6 +22110,19 @@
         "is-typedarray": "^1.0.0"
       }
     },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -23309,6 +23080,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",

client/package.json

@@ -9,14 +9,12 @@
     "@craco/craco": "^7.0.0",
     "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@jsreport/browser-client": "^3.1.0",
-    "@sentry/cli": "^2.27.0",
-    "@sentry/react": "^7.99.0",
+    "@sentry/react": "^7.40.0",
     "@sentry/tracing": "^7.40.0",
     "@splitsoftware/splitio-react": "^1.8.1",
     "@tanem/react-nprogress": "^5.0.8",
     "antd": "^4.24.8",
     "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^3.3.0",
     "axios": "^1.3.4",
     "craco-less": "^2.0.0",
     "dinero.js": "^1.9.1",
@@ -90,14 +88,13 @@
   "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",
+    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "build:test": "env-cmd -f .env.test npm run build",
     "build-deploy:test": "npm 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 .",
-    "sentry:sourcemaps": "sentry-cli sourcemaps inject --org imex --project imexonline ./build && sentry-cli sourcemaps upload --org imex --project imexonline ./build"
+    "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ."
   },
   "eslintConfig": {
     "extends": [

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/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,21 +1,21 @@
-import { Card, Checkbox, Input, Space, Table } from "antd";
-import queryString from "query-string";
+import { Input, Table, Checkbox, Card, Space } from "antd";
 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";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -138,6 +138,7 @@ export function AccountingPayablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
+
       render: (text, record) => (
         <ExportLogsCountDisplay logs={record.exportlogs} />
       ),
@@ -146,6 +147,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}

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

@@ -8,16 +8,14 @@ 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, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay 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";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -77,11 +75,7 @@ export function AccountingPayablesTableComponent({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          OwnerNameDisplayFunction(a.job),
-          OwnerNameDisplayFunction(b.job)
-        ),
+      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -100,9 +94,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 +112,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"),
-    //   dataIndex: "exportedat",
-    //   key: "exportedat",
-    //   render: (text, record) => (
-    //     <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-    //   ),
-    // },
+    {
+      title: t("payments.fields.exportedat"),
+      dataIndex: "exportedat",
+      key: "exportedat",
+      render: (text, record) => (
+        <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+      ),
+    },
     {
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
@@ -149,6 +137,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}

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) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       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/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({});
-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 }) {
+export default function BillDeleteButton({ bill, callback }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -48,11 +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 {

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

@@ -10,7 +10,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 +20,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 +32,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(
@@ -150,7 +149,6 @@ export function BillDetailEditcontainer({
       jobid: bill.jobid,
       billid: search.billid,
       operation: AuditTrailMapping.billupdated(bill.invoice_number),
-      type: "billupdated",
     });
 
     await refetch();
@@ -178,7 +176,7 @@ export function BillDetailEditcontainer({
             extra={
               <Space>
                 <BillDetailEditReturn data={data} />
-                <BillPrintButton billid={search.billid} />
+
                 <Popconfirm
                   visible={visible}
                   onConfirm={() => form.submit()}

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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(

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

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, billid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, billid, operation, type })),
+  insertAuditTrail: ({ jobid, billid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation })),
 });
 
 const Templates = TemplateList("job_special");
@@ -94,7 +94,6 @@ function BillEnterModalContainer({
       location,
       outstanding_returns,
       inventory,
-      federal_tax_exempt,
       ...remainingValues
     } = values;
 
@@ -171,7 +170,6 @@ function BillEnterModalContainer({
             mod_lbr_ty: key,
             hours: adjustmentsToInsert[key].toFixed(1),
           }),
-          type: "jobmodifylbradj",
         });
       });
 
@@ -321,7 +319,6 @@ function BillEnterModalContainer({
       operation: AuditTrailMapping.billposted(
         r1.data.insert_bills.returning[0].invoice_number
       ),
-      type: "billposted",
     });
 
     if (enterAgain) {

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

@@ -79,20 +79,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]);
@@ -401,16 +387,7 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} />
         </Form.Item>
-        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
-          <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}>
+        <Form.Item shouldUpdate span={15}>
           {() => {
             const values = form.getFieldsValue([
               "billlines",
@@ -428,7 +405,7 @@ export function BillFormComponent({
               totals = CalculateBillTotal(values);
             if (!!totals)
               return (
-                <div align="right">
+                <div>
                   <Space wrap>
                     <Statistic
                       title={t("bills.labels.subtotal")}

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,
-  Form,
+  Button, 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:
-              form.getFieldValue("federal_tax_exempt") === true ? false : true,
+            initialValue: 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,7 +58,7 @@ export function BillsListTableComponent({
           <EditFilled />
         </Button>
       )}
-      <BillDeleteButton bill={record} jobid={job.id} />
+      <BillDeleteButton bill={record} />
       <BillDetailEditReturnComponent
         data={{ bills_by_pk: { ...record, jobid: job.id } }}
         disabled={

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

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -102,7 +102,6 @@ const CardPaymentModalComponent = ({
         insertAuditTrail({
           jobid: payment.jobid,
           operation: AuditTrailMapping.failedpayment(),
-          type: "failedpayment",
         })
       );
     });

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

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

@@ -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.nextservicekm <= form.getFieldValue("kmstart")
-                  : false;
+                selectedCar &&
+                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
+
               const dueForService =
                 selectedCar &&
                 selectedCar.nextservicedate &&
-                moment(selectedCar.nextservicedate)
-                  .endOf("day")
-                  .isSameOrBefore(
-                    moment(form.getFieldValue("scheduledreturn"))
-                  );
+                moment(selectedCar.nextservicedate).isBefore(
+                  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>

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

@@ -7,7 +7,6 @@ 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";
@@ -214,9 +213,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
-          <CourtesyCarReadiness />
-        </Form.Item>
         <div>
           <Form.Item
             label={t("courtesycars.fields.nextservicekm")}
@@ -231,9 +227,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           >
             {() => {
               const nextservicekm = form.getFieldValue("nextservicekm");
-              const mileageOver = nextservicekm
-                ? nextservicekm <= form.getFieldValue("mileage")
-                : false;
+              const mileageOver =
+                nextservicekm && nextservicekm <= form.getFieldValue("mileage");
               if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>

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-cars-list/courtesy-cars-list.component.jsx

@@ -17,18 +17,13 @@ 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 { 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,7 +50,6 @@ 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"),
@@ -78,34 +72,18 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
-        const { nextservicedate, nextservicekm, mileage, insuranceexpires } =
-          record;
+        const { nextservicedate, nextservicekm, mileage } = record;
 
-        const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
+        const mileageOver = nextservicekm <= mileage;
 
         const dueForService =
-          nextservicedate &&
-          moment(nextservicedate).endOf("day").isSameOrBefore(moment());
-
-        const insuranceOver =
-          insuranceexpires &&
-          moment(insuranceexpires).endOf("day").isBefore(moment());
+          nextservicedate && moment(nextservicedate).isBefore(moment());
 
         return (
           <Space>
             {t(record.status)}
-            {(mileageOver || dueForService || insuranceOver) && (
-              <Tooltip
-                title={
-                  (mileageOver || dueForService) && insuranceOver
-                    ? t("contracts.labels.insuranceexpired") +
-                      " / " +
-                      t("contracts.labels.cardueforservice")
-                    : insuranceOver
-                    ? t("contracts.labels.insuranceexpired")
-                    : t("contracts.labels.cardueforservice")
-                }
-              >
+            {(mileageOver || dueForService) && (
+              <Tooltip title={t("contracts.labels.cardueforservice")}>
                 <WarningFilled style={{ color: "tomato" }} />
               </Tooltip>
             )}
@@ -113,27 +91,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",
@@ -174,36 +131,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) => alphaSort(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 63:
-            return t("courtesycars.labels.fuel.58");
-          case 50:
-            return t("courtesycars.labels.fuel.12");
-          case 38:
-            return t("courtesycars.labels.fuel.34");
-          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",
@@ -234,8 +161,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, sortedInfo: sorter });
-    setFilter(filters);
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
   const tableData = searchText

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,9 @@ 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, dateSort } from "../../utils/sorters";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import { alphaSort } from "../../utils/sorters";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 
 export default function CsiResponseListPaginated({
   refetch,
@@ -18,23 +16,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:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      sortOrder: sortcolumn === "ro_number" && sortorder,
+
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.job.id}>
           {record.job.ro_number || t("general.labels.na")}
@@ -43,18 +41,15 @@ export default function CsiResponseListPaginated({
     },
     {
       title: t("jobs.fields.owner"),
-      dataIndex: "owner_name",
-      key: "owner_name",
-      sorter: (a, b) =>
-        alphaSort(
-          OwnerNameDisplayFunction(a.job),
-          OwnerNameDisplayFunction(b.job)
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner_name" && state.sortedInfo.order,
+      dataIndex: "owner",
+      key: "owner",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+      width: "25%",
+      sortOrder: sortcolumn === "owner" && sortorder,
       render: (text, record) => {
-        return record.job.ownerid ? (
-          <Link to={"/manage/owners/" + record.job.ownerid}>
+        return record.job.owner ? (
+          <Link to={"/manage/owners/" + record.job.owner.id}>
             <OwnerNameDisplay ownerObject={record.job} />
           </Link>
         ) : (
@@ -69,9 +64,9 @@ export default function CsiResponseListPaginated({
       dataIndex: "completedon",
       key: "completedon",
       ellipsis: true,
-      sorter: (a, b) => dateSort(a.completedon, b.completedon),
-      sortOrder:
-        state.sortedInfo.columnKey === "completedon" && state.sortedInfo.order,
+      sorter: (a, b) => a.completedon - b.completedon,
+      width: "25%",
+      sortOrder: sortcolumn === "completedon" && sortorder,
       render: (text, record) => {
         return record.completedon ? (
           <DateFormatter>{record.completedon}</DateFormatter>
@@ -81,12 +76,11 @@ export default function CsiResponseListPaginated({
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({
-      ...state,
-      filteredInfo: filters,
-      sortedInfo: sorter,
-      page: pagination.current,
-    });
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    search.page = pagination.current;
+    search.sortcolumn = sorter.columnKey;
+    search.sortorder = sorter.order;
+    history.push({ search: queryString.stringify(search) });
   };
 
   const handleOnRowClick = (record) => {
@@ -114,7 +108,7 @@ export default function CsiResponseListPaginated({
         pagination={{
           position: "top",
           pageSize: pageLimit,
-          current: parseInt(state.page || 1),
+          current: parseInt(page || 1),
           total: total,
         }}
         columns={columns}
@@ -128,6 +122,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_order_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/scheduled-in-today/scheduled-in-today.component.jsx

@@ -3,32 +3,21 @@ import {
   ExclamationCircleFilled,
   PauseCircleOutlined,
 } from "@ant-design/icons";
-import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
+import { Card, Space, Table, Tooltip } 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 OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
+import {pageLimit} from "../../../utils/config";
 
 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} />;
@@ -42,12 +31,6 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
         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,
@@ -66,7 +49,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
         v_vin: item.job.v_vin,
         vehicleid: item.job.vehicleid,
         note: item.note,
-        start: item.start,
+        start: moment(item.start).format("hh:mm a"),
         title: item.title,
       };
       appt.push(i);
@@ -76,192 +59,11 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
     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}
@@ -289,10 +91,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+      responsive: ["md"],
       render: (text, record) => {
         return record.ownerid ? (
           <Link
@@ -309,16 +108,23 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       },
     },
     {
-      title: t("dashboard.labels.phone"),
-      dataIndex: "ownr_ph",
-      key: "ownr_ph",
+      title: t("jobs.fields.ownr_ph1"),
+      dataIndex: "ownr_ph1",
+      key: "ownr_ph1",
       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>
+        <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+      ),
+    },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
       ),
     },
     {
@@ -328,7 +134,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       ellipsis: true,
       responsive: ["md"],
       render: (text, record) => (
-        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
+        <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid} />
       ),
     },
     {
@@ -336,15 +142,6 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       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
@@ -368,80 +165,43 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       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.time"),
+      dataIndex: "start",
+      key: "start",
+      ellipsis: true,
+      responsive: ["md"],
     },
     {
       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),
+      responsive: ["md"],
     },
   ];
 
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  const handleTableChange = (sorter) => {
+    setState({ ...state, sortedInfo: sorter });
   };
 
   return (
     <Card
-      title={t("dashboard.titles.scheduledindate", {
+      title={t("dashboard.titles.scheduledintoday", {
         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}
+          pagination={{ position: "top", defaultPageSize: pageLimit }}
+          columns={columns}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
           dataSource={appt}
-          size={isTvModeScheduledIn ? "small" : "middle"}
         />
       </div>
     </Card>
@@ -460,10 +220,6 @@ export const DashboardScheduledInTodayGql = `
       alt_transport
       clm_no
       jobid: id
-      joblines(where: {removed: {_eq: false}}) {
-        mod_lb_hrs
-        mod_lbr_ty
-      }
       ins_co_nm
       iouparent
       ownerid

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

@@ -3,272 +3,37 @@ import {
   ExclamationCircleFilled,
   PauseCircleOutlined,
 } from "@ant-design/icons";
-import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
+import { Card, Space, Table, Tooltip } 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 OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
+import {pageLimit} from "../../../utils/config";
 
 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;
+    item.scheduled_completion= moment(item.scheduled_completion).format("hh:mm a")
   });
   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}
@@ -296,10 +61,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+      responsive: ["md"],
       render: (text, record) => {
         return record.ownerid ? (
           <Link
@@ -316,16 +78,23 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       },
     },
     {
-      title: t("dashboard.labels.phone"),
-      dataIndex: "ownr_ph",
-      key: "ownr_ph",
+      title: t("jobs.fields.ownr_ph1"),
+      dataIndex: "ownr_ph1",
+      key: "ownr_ph1",
       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>
+        <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+      ),
+    },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
       ),
     },
     {
@@ -335,7 +104,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       ellipsis: true,
       responsive: ["md"],
       render: (text, record) => (
-        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
+        <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid} />
       ),
     },
     {
@@ -343,15 +112,6 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       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
@@ -375,80 +135,43 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       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("jobs.fields.scheduled_completion"),
+      dataIndex: "scheduled_completion",
+      key: "scheduled_completion",
+      ellipsis: true,
+      responsive: ["md"],
     },
     {
       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),
+      responsive: ["md"],
     },
   ];
 
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  const handleTableChange = (sorter) => {
+    setState({ ...state, sortedInfo: sorter });
   };
 
   return (
     <Card
-      title={t("dashboard.titles.scheduledoutdate", {
+      title={t("dashboard.titles.scheduledouttoday", {
         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}
+          pagination={{ position: "top", defaultPageSize: pageLimit }}
+          columns={columns}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
           dataSource={data.scheduled_out_today}
-          size={isTvModeScheduledOut ? "small" : "middle"}
         />
       </div>
     </Card>
@@ -465,10 +188,6 @@ export const DashboardScheduledOutTodayGql = `
       alt_transport
       clm_no
       jobid: id
-      joblines(where: {removed: {_eq: false}}) {
-        mod_lb_hrs
-        mod_lbr_ty
-      }
       ins_co_nm
       iouparent
       ownerid
@@ -481,7 +200,6 @@ export const DashboardScheduledOutTodayGql = `
       production_vars
       ro_number
       scheduled_completion
-      status
       suspended
       v_make_desc
       v_model_desc

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

@@ -1,391 +1,386 @@
-import Icon, {SyncOutlined} from "@ant-design/icons";
-import {gql, useMutation, useQuery} from "@apollo/client";
-import {Button, Dropdown, Menu, notification, PageHeader, Space} from "antd";
+import Icon, { SyncOutlined } from "@ant-design/icons";
+import { gql, useMutation, useQuery } from "@apollo/client";
+import { Button, Dropdown, Menu, PageHeader, Space, notification } from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
-import React, {useState} from "react";
-import {Responsive, WidthProvider} from "react-grid-layout";
-import {useTranslation} from "react-i18next";
-import {MdClose} from "react-icons/md";
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {logImEXEvent} from "../../firebase/firebase.utils";
-import {UPDATE_DASHBOARD_LAYOUT} from "../../graphql/user.queries";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import React, { useState } from "react";
+import { Responsive, WidthProvider } from "react-grid-layout";
+import { useTranslation } from "react-i18next";
+import { MdClose } from "react-icons/md";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
+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
-    from "../dashboard-components/total-production-dollars/total-production-dollars.component";
+import DashboardTotalProductionDollars 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,
+  DashboardScheduledInTodayGql,
 } from "../dashboard-components/scheduled-in-today/scheduled-in-today.component";
 import DashboardScheduledOutToday, {
-    DashboardScheduledOutTodayGql,
+  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,
-    bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-    //setUserLanguage: language => dispatch(setUserLanguage(language))
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function DashboardGridComponent({currentUser, bodyshop}) {
-    const {t} = useTranslation();
-    const [state, setState] = useState({
-        ...(bodyshop.associations[0].user.dashboardlayout
-            ? bodyshop.associations[0].user.dashboardlayout
-            : {items: [], layout: {}, layouts: []}),
+export function DashboardGridComponent({ currentUser, bodyshop }) {
+  const { t } = useTranslation();
+  const [state, setState] = useState({
+    ...(bodyshop.associations[0].user.dashboardlayout
+      ? bodyshop.associations[0].user.dashboardlayout
+      : { items: [], layout: {}, layouts: [] }),
+  });
+
+  const { 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(
-        createDashboardQuery(state),
-        {fetchPolicy: "network-only", nextFetchPolicy: "network-only"}
-    );
+    const items = _.cloneDeep(state.items);
 
-    const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
+    items.splice(idxToRemove, 1);
+    setState({ ...state, items });
+  };
 
-    const handleLayoutChange = async (layout, layouts) => {
-        logImEXEvent("dashboard_change_layout");
+  const handleAddComponent = (e) => {
+    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}>
+      {Object.keys(componentList).map((key) => (
+        <Menu.Item
+          key={key}
+          value={key}
+          disabled={existingLayoutKeys.includes(key)}
+        >
+          {componentList[key].label}
+        </Menu.Item>
+      ))}
+    </Menu>
+  );
 
-        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),
-                }),
-            });
+  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>
         }
-    };
-    const handleRemoveComponent = (key) => {
-        logImEXEvent("dashboard_remove_component", {name: key});
-        const idxToRemove = state.items.findIndex((i) => i.i === key);
+      />
 
-        const items = _.cloneDeep(state.items);
-
-        items.splice(idxToRemove, 1);
-        setState({...state, items});
-    };
-
-    const handleAddComponent = (e) => {
-        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,
-                },
-            ],
-        });
-    };
-
-    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}
+      <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) => {
+          const TheComponent = componentList[item.i].component;
+          return (
+            <div
+              key={item.i}
+              data-grid={{
+                ...item,
+                minH: componentList[item.i].minH || 1,
+                minW: componentList[item.i].minW || 1,
+              }}
             >
-                {state.items.map((item, index) => {
-                    const TheComponent = componentList[item.i].component;
-                    return (
-                        <div
-                            key={item.i}
-                            data-grid={{
-                                ...item,
-                                minH: componentList[item.i].minH || 1,
-                                minW: componentList[item.i].minW || 1,
-                            }}
-                        >
-                            <LoadingSkeleton loading={loading}>
-                                <Icon
-                                    component={MdClose}
-                                    key={item.i}
-                                    style={{
-                                        position: "absolute",
-                                        zIndex: "2",
-                                        right: ".25rem",
-                                        top: ".25rem",
-                                        cursor: "pointer",
-                                    }}
-                                    onClick={() => handleRemoveComponent(item.i)}
-                                />
-                                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboarddata}/>
-                            </LoadingSkeleton>
-                        </div>
-                    );
-                })}
-            </ResponsiveReactGridLayout>
-        </div>
-    );
+              <LoadingSkeleton loading={loading}>
+                <Icon
+                  component={MdClose}
+                  key={item.i}
+                  style={{
+                    position: "absolute",
+                    zIndex: "2",
+                    right: ".25rem",
+                    top: ".25rem",
+                    cursor: "pointer",
+                  }}
+                  onClick={() => handleRemoveComponent(item.i)}
+                />
+                <TheComponent className="dashboard-card" data={dashboarddata} />
+              </LoadingSkeleton>
+            </div>
+          );
+        })}
+      </ResponsiveReactGridLayout>
+    </div>
+  );
 }
 
 export default connect(
-    mapStateToProps,
-    mapDispatchToProps
+  mapStateToProps,
+  mapDispatchToProps
 )(DashboardGridComponent);
 
 const componentList = {
-    ProductionDollars: {
-        label: i18next.t("dashboard.titles.productiondollars"),
-        component: DashboardTotalProductionDollars,
-        gqlFragment: null,
-        w: 1,
-        h: 1,
-        minW: 2,
-        minH: 1,
-    },
-    ProductionHours: {
-        label: i18next.t("dashboard.titles.productionhours"),
-        component: DashboardTotalProductionHours,
-        gqlFragment: DashboardTotalProductionHoursGql,
-        w: 3,
-        h: 1,
-        minW: 3,
-        minH: 1,
-    },
-    ProjectedMonthlySales: {
-        label: i18next.t("dashboard.titles.projectedmonthlysales"),
-        component: DashboardProjectedMonthlySales,
-        gqlFragment: DashboardProjectedMonthlySalesGql,
-        w: 2,
-        h: 1,
-        minW: 2,
-        minH: 1,
-    },
-    MonthlyRevenueGraph: {
-        label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
-        component: DashboardMonthlyRevenueGraph,
-        gqlFragment: DashboardMonthlyRevenueGraphGql,
-        w: 4,
-        h: 2,
-        minW: 4,
-        minH: 2,
-    },
-    MonthlyJobCosting: {
-        label: i18next.t("dashboard.titles.monthlyjobcosting"),
-        component: DashboardMonthlyJobCosting,
-        gqlFragment: null,
-        minW: 6,
-        minH: 3,
-        w: 6,
-        h: 3,
-    },
-    MonthlyPartsSales: {
-        label: i18next.t("dashboard.titles.monthlypartssales"),
-        component: DashboardMonthlyPartsSales,
-        gqlFragment: null,
-        minW: 2,
-        minH: 2,
-        w: 2,
-        h: 2,
-    },
-    MonthlyLaborSales: {
-        label: i18next.t("dashboard.titles.monthlylaborsales"),
-        component: DashboardMonthlyLaborSales,
-        gqlFragment: null,
-        minW: 2,
-        minH: 2,
-        w: 2,
-        h: 2,
-    },
-    // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
-    MonthlyEmployeeEfficency: {
-        label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
-        component: DashboardMonthlyEmployeeEfficiency,
-        gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
-        minW: 2,
-        minH: 2,
-        w: 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,
-    },
+  ProductionDollars: {
+    label: i18next.t("dashboard.titles.productiondollars"),
+    component: DashboardTotalProductionDollars,
+    gqlFragment: null,
+    w: 1,
+    h: 1,
+    minW: 2,
+    minH: 1,
+  },
+  ProductionHours: {
+    label: i18next.t("dashboard.titles.productionhours"),
+    component: DashboardTotalProductionHours,
+    gqlFragment: DashboardTotalProductionHoursGql,
+    w: 3,
+    h: 1,
+    minW: 3,
+    minH: 1,
+  },
+  ProjectedMonthlySales: {
+    label: i18next.t("dashboard.titles.projectedmonthlysales"),
+    component: DashboardProjectedMonthlySales,
+    gqlFragment: DashboardProjectedMonthlySalesGql,
+    w: 2,
+    h: 1,
+    minW: 2,
+    minH: 1,
+  },
+  MonthlyRevenueGraph: {
+    label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
+    component: DashboardMonthlyRevenueGraph,
+    gqlFragment: DashboardMonthlyRevenueGraphGql,
+    w: 4,
+    h: 2,
+    minW: 4,
+    minH: 2,
+  },
+  MonthlyJobCosting: {
+    label: i18next.t("dashboard.titles.monthlyjobcosting"),
+    component: DashboardMonthlyJobCosting,
+    gqlFragment: null,
+    minW: 6,
+    minH: 3,
+    w: 6,
+    h: 3,
+  },
+  MonthlyPartsSales: {
+    label: i18next.t("dashboard.titles.monthlypartssales"),
+    component: DashboardMonthlyPartsSales,
+    gqlFragment: null,
+    minW: 2,
+    minH: 2,
+    w: 2,
+    h: 2,
+  },
+  MonthlyLaborSales: {
+    label: i18next.t("dashboard.titles.monthlylaborsales"),
+    component: DashboardMonthlyLaborSales,
+    gqlFragment: null,
+    minW: 2,
+    minH: 2,
+    w: 2,
+    h: 2,
+  },
+  MonthlyEmployeeEfficency: {
+    label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
+    component: DashboardMonthlyEmployeeEfficiency,
+    gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
+    minW: 2,
+    minH: 2,
+    w: 2,
+    h: 2,
+  },
+  ScheduleInToday: {
+    label: i18next.t("dashboard.titles.scheduledintoday", {
+      date: moment().startOf("day").format("MM/DD/YYYY"),
+    }),
+    component: DashboardScheduledInToday,
+    gqlFragment: DashboardScheduledInTodayGql,
+    minW: 10,
+    minH: 2,
+    w: 10,
+    h: 2,
+  },
+  ScheduleOutToday: {
+    label: i18next.t("dashboard.titles.scheduledouttoday", {
+      date: moment().startOf("day").format("MM/DD/YYYY"),
+    }),
+    component: DashboardScheduledOutToday,
+    gqlFragment: DashboardScheduledOutTodayGql,
+    minW: 10,
+    minH: 2,
+    w: 10,
+    h: 2,
+  },
 };
 
 const createDashboardQuery = (state) => {
-    const componentBasedAdditions =
-        state &&
-        Array.isArray(state.layout) &&
-        state.layout
-            .map((item, index) => componentList[item.i].gqlFragment || "")
-            .join("");
-    return gql`
-        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
-            monthly_sales: jobs(where: {_and: [
-                { voided: {_eq: false}},
-                {date_invoiced: {_gte: "${moment()
+  const componentBasedAdditions =
+    state &&
+    Array.isArray(state.layout) &&
+    state.layout
+      .map((item, index) => componentList[item.i].gqlFragment || "")
+      .join("");
+  return gql`
+    query QUERY_DASHBOARD_DETAILS {
+         ${componentBasedAdditions || ""}
+      monthly_sales: jobs(where: {_and: [
+        { voided: {_eq: false}},
+        {date_invoiced: {_gte: "${moment()
           .startOf("month")
-                .startOf("day")
-                .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+          .startOf("day")
+          .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
-      id
-                ro_number
-                date_invoiced
-                job_totals
-                rate_la1
-                rate_la2
-                rate_la3
-                rate_la4
-                rate_laa
-                rate_lab
-                rate_lad
-                rate_lae
-                rate_laf
-                rate_lag
-                rate_lam
-                rate_lar
-                rate_las
-                rate_lau
-                rate_ma2s
-                rate_ma2t
-                rate_ma3s
-                rate_mabl
-                rate_macs
-                rate_mahw
-                rate_mapa
-                rate_mash
-                rate_matd
-                joblines(where: { removed: { _eq: false } }) {
-                    id
-                    mod_lbr_ty
-                    mod_lb_hrs
-                    act_price
-                    part_qty
-                    part_type
-                }
-                }
-                production_jobs: jobs(where: { inproduction: { _eq: true } }) {
-                    id
-                    ro_number
-                    ins_co_nm
-                    job_totals
-                    joblines(where: { removed: { _eq: false } }) {
-                    id
-                    mod_lbr_ty
-                    mod_lb_hrs
-                    act_price
-                    part_qty
-                    part_type
-                }
-                labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
-                    aggregate {
-                        sum {
-                            mod_lb_hrs
-                        }
-                    }
-                }
-                larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
-                    aggregate {
-                        sum {
-                            mod_lb_hrs
-                        }
-                    }
-                }
-                }
-            }`;
+    id
+    ro_number
+    date_invoiced
+    job_totals
+          rate_la1
+      rate_la2
+      rate_la3
+      rate_la4
+      rate_laa
+      rate_lab
+      rate_lad
+      rate_lae
+      rate_laf
+      rate_lag
+      rate_lam
+      rate_lar
+      rate_las
+      rate_lau
+      rate_ma2s
+      rate_ma2t
+      rate_ma3s
+      rate_mabl
+      rate_macs
+      rate_mahw
+      rate_mapa
+      rate_mash
+      rate_matd
+    joblines(where: { removed: { _eq: false } }) {
+        id
+        mod_lbr_ty
+        mod_lb_hrs
+        act_price
+        part_qty
+        part_type
+    }
+  }
+      production_jobs: jobs(where: { inproduction: { _eq: true } }) {
+        id
+        ro_number
+        ins_co_nm
+        job_totals
+        joblines(where: { removed: { _eq: false } }) {
+          id
+          mod_lbr_ty
+          mod_lb_hrs
+          act_price
+          part_qty
+          part_type
+        }
+        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
+          }
+        }
+        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
+          aggregate {
+            sum {
+              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/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(
-  connect(mapStateToProps, mapDispatchToProps)(withTranslation()(ErrorBoundary))
-);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withTranslation()(ErrorBoundary));

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

@@ -13,7 +13,7 @@ import Icon, {
   FileFilled,
   //GlobalOutlined,
   HomeFilled,
-  ImportOutlined, InfoCircleOutlined,
+  ImportOutlined,
   LineChartOutlined,
   PaperClipOutlined,
   PhoneOutlined,
@@ -26,8 +26,8 @@ import Icon, {
   UserOutlined,
 } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import {Layout, Menu, Switch, Tooltip} from "antd";
-import React, {useEffect, useState} from "react";
+import { Layout, Menu } from "antd";
+import React 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,
@@ -103,21 +102,9 @@ function Header({
     {},
     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
@@ -444,17 +431,6 @@ function Header({
             </Menu.Item>
           ))}
         </Menu.SubMenu>
-        <Menu.Item style={{marginLeft: 'auto'}} key="profile">
-          <Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
-            <InfoCircleOutlined/>
-            <span style={{marginRight: 8}}>Try the new ImEX Online</span>
-            <Switch
-                checked={betaSwitch}
-                onChange={betaSwitchChange}
-            />
-          </Tooltip>
-        </Menu.Item>
-
       </Menu>
     </Layout.Header>
   );

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

@@ -53,7 +53,6 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
           insertAuditTrail({
             jobid: event.job.id,
             operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
-            type: "appointmentcancel",
           })
         );
       }

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

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    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"]({

client/src/components/job-create-iou/job-create-iou.component.jsx

@@ -7,31 +7,21 @@ import { connect } from "react-redux";
 import { useHistory } from "react-router";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINES_IOU } from "../../graphql/jobs-lines.queries";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { CreateIouForJob } from "../jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
-  technician: selectTechnician,
 });
-
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobCreateIOU);
 
-export function JobCreateIOU({
-  bodyshop,
-  currentUser,
-  job,
-  selectedJobLines,
-  technician,
-}) {
+export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
@@ -89,19 +79,13 @@ export function JobCreateIOU({
       title={t("jobs.labels.createiouwarning")}
       onConfirm={handleCreateIou}
       disabled={
-        !selectedJobLines ||
-        selectedJobLines.length === 0 ||
-        !job.converted ||
-        technician
+        !selectedJobLines || selectedJobLines.length === 0 || !job.converted
       }
     >
       <Button
         loading={loading}
         disabled={
-          !selectedJobLines ||
-          selectedJobLines.length === 0 ||
-          !job.converted ||
-          technician
+          !selectedJobLines || selectedJobLines.length === 0 || !job.converted
         }
       >
         {t("jobs.actions.createiou")}

client/src/components/job-detail-cards/job-detail-cards.template.component.jsx

@@ -1,37 +1,15 @@
-import { Card } from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
+import { Card } from "antd";
 import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 
-const mapStateToProps = createStructuredSelector({
-  technician: selectTechnician,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobDetailCardTemplate);
-
-export function JobDetailCardTemplate({
+export default function JobDetailCardTemplate({
   loading,
   title,
   extraLink,
-  technician,
   ...otherProps
 }) {
-  const { t } = useTranslation();
-
   let extra;
-  if (extraLink && !technician)
-    extra = {
-      extra: <Link to={extraLink}>{t("jobs.labels.cards.more")}</Link>,
-    };
+  if (extraLink) extra = { extra: <Link to={extraLink}>More</Link> };
   return (
     <Card
       size="small"

client/src/components/job-detail-cards/job-detail-cards.totals.component.jsx

@@ -18,8 +18,10 @@ export default function JobDetailCardsTotalsComponent({ loading, data }) {
           />
           <Statistic
             className="imex-flex-row__margin-large"
-            title={t("jobs.fields.customerowing")}
-            value={Dinero(data.job_totals.totals.custPayable.total).toFormat()}
+            title={t("jobs.fields.ded_amt")}
+            value={Dinero({
+              amount: Math.round((data.ded_amt || 0) * 100),
+            }).toFormat()}
           />
           <Statistic
             className="imex-flex-row__margin-large"

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(
   mapStateToProps,
@@ -46,7 +46,6 @@ export function JobEmployeeAssignmentsContainer({
     insertAuditTrail({
       jobid: job.id,
       operation: AuditTrailMapping.jobassignmentchange(operation, name),
-      type: "jobassignmentchange",
     });
 
     if (!!result.errors) {
@@ -77,7 +76,6 @@ export function JobEmployeeAssignmentsContainer({
     insertAuditTrail({
       jobid: job.id,
       operation: AuditTrailMapping.jobassignmentremoved(operation),
-      type: "jobassignmentremoved",
     });
     setLoading(false);
   };

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

@@ -1,246 +0,0 @@
-import React, {useCallback, useEffect, useState} from 'react';
-import moment from "moment";
-import axios from 'axios';
-import {Badge, Card, Space, Table, Tag} from 'antd';
-import {gql, useQuery} from "@apollo/client";
-import {DateTimeFormatterFunction} from "../../utils/DateFormatter";
-import {isEmpty} from "lodash";
-import {useTranslation} from "react-i18next";
-
-require('./job-lifecycle.styles.scss');
-
-// show text on bar if text can fit
-export function JobLifecycleComponent({job, statuses, ...rest}) {
-    const [loading, setLoading] = useState(true);
-    const [lifecycleData, setLifecycleData] = useState(null);
-    const {t} = useTranslation();    // Used for tracking external state changes.
-
-    const {data} = useQuery(gql`
-        query get_job_test($id: uuid!){
-            jobs_by_pk(id:$id){
-                id
-                status
-            }
-        }
-    `, {
-        variables: {
-            id: job.id
-        },
-        fetchPolicy: 'cache-only'
-    });
-
-    /**
-     * Gets the lifecycle data for the job.
-     * @returns {Promise<void>}
-     */
-    const getLifecycleData = useCallback(async () => {
-        if (job && job.id && statuses && statuses.statuses) {
-            try {
-                setLoading(true);
-                const response = await axios.post("/job/lifecycle", {
-                    jobids: job.id,
-                    statuses: statuses.statuses
-                });
-                const data = response.data.transition[job.id];
-                setLifecycleData(data);
-            } catch (err) {
-                console.error(`${t('job_lifecycle.errors.fetch')}: ${err.message}`);
-            } finally {
-                setLoading(false);
-            }
-        }
-    }, [job, statuses, t]);
-
-    useEffect(() => {
-        if (!data) return;
-        setTimeout(() => {
-            getLifecycleData().catch(err => console.error(`${t('job_lifecycle.errors.fetch')}: ${err.message}`));
-        }, 500);
-    }, [data, getLifecycleData, t]);
-
-    const columns = [
-        {
-            title: t('job_lifecycle.columns.value'),
-            dataIndex: 'value',
-            key: 'value',
-        },
-        {
-            title: t('job_lifecycle.columns.start'),
-            dataIndex: 'start',
-            key: 'start',
-            render: (text) => DateTimeFormatterFunction(text),
-            sorter: (a, b) => moment(a.start).unix() - moment(b.start).unix(),
-        },
-        {
-            title: t('job_lifecycle.columns.relative_start'),
-            dataIndex: 'start_readable',
-            key: 'start_readable',
-        },
-        {
-            title: t('job_lifecycle.columns.end'),
-            dataIndex: 'end',
-            key: 'end',
-            sorter: (a, b) => {
-                if (isEmpty(a.end) || isEmpty(b.end)) {
-                    if (isEmpty(a.end) && isEmpty(b.end)) {
-                        return 0;
-                    }
-                    return isEmpty(a.end) ? 1 : -1;
-                }
-                return moment(a.end).unix() - moment(b.end).unix();
-            },
-            render: (text) => isEmpty(text) ? t('job_lifecycle.content.not_available') : DateTimeFormatterFunction(text)
-        },
-        {
-            title: t('job_lifecycle.columns.relative_end'),
-            dataIndex: 'end_readable',
-            key: 'end_readable',
-        },
-        {
-            title: t('job_lifecycle.columns.duration'),
-            dataIndex: 'duration_readable',
-            key: 'duration_readable',
-            sorter: (a, b) => a.duration - b.duration,
-        },
-    ];
-
-    return (
-        <Card loading={loading} title={t('job_lifecycle.content.title')}>
-            {!loading ? (
-                lifecycleData && lifecycleData.lifecycle && lifecycleData.durations ? (
-                    <Space direction='vertical' style={{width: '100%'}}>
-                        <Card
-                            type='inner'
-                            title={(
-                                <Space direction='horizontal' size='small'>
-                                    <Badge status='processing' count={lifecycleData.durations.totalStatuses}/>
-                                    {t('job_lifecycle.content.title_durations')}
-                                </Space>
-
-                            )}
-                            style={{width: '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.durations.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 type='inner' title={t('job_lifecycle.content.legend_title')}
-                                  style={{marginTop: '10px'}}>
-                                <div>
-                                    {lifecycleData.durations.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} ({key.roundedPercentage})
-                                            </div>
-                                        </Tag>
-                                    ))}
-                                </div>
-                            </Card>
-                            {(lifecycleData?.durations?.humanReadableTotal) ||
-                            (lifecycleData.lifecycle[0] && lifecycleData.lifecycle[0].value && lifecycleData?.durations?.totalCurrentStatusDuration?.humanReadable) ?
-                                <Card style={{marginTop: '10px'}}>
-                                    <ul>
-                                        {lifecycleData.durations && lifecycleData.durations.humanReadableTotal &&
-                                            <li>
-                                                <span
-                                                    style={{fontWeight: 'bold'}}>{t('job_lifecycle.content.previous_status_accumulated_time')}:</span> {lifecycleData.durations.humanReadableTotal}
-                                            </li>
-                                        }
-                                        {lifecycleData.lifecycle[0] && lifecycleData.lifecycle[0].value && lifecycleData?.durations?.totalCurrentStatusDuration?.humanReadable &&
-                                            <li>
-                                                <span
-                                                    style={{fontWeight: 'bold'}}>{t('job_lifecycle.content.current_status_accumulated_time')} ({lifecycleData.lifecycle[0].value}):</span> {lifecycleData.durations.totalCurrentStatusDuration.humanReadable}
-                                            </li>
-                                        }
-                                    </ul>
-                                </Card>
-                                : null}
-                        </Card>
-                        <Card type='inner' title={(
-                            <>
-                                <Space direction="horizontal" size="small">
-                                    <Badge status='processing' count={lifecycleData.lifecycle.length}/>
-                                    {t('job_lifecycle.content.title_transitions')}
-                                </Space>
-                            </>
-                        )}>
-                            <Table style={{
-                                overflow: 'auto',
-                                width: '100%',
-                            }} columns={columns} dataSource={lifecycleData.lifecycle}/>
-                        </Card>
-                    </Space>
-                ) : (
-                    <Card type='inner' style={{textAlign: 'center'}}>
-                        {t('job_lifecycle.content.data_unavailable')}
-                    </Card>
-                )
-            ) : (
-                <Card type='inner' title={t('job_lifecycle.content.title_loading')}>
-                    {t('job_lifecycle.content.loading')}
-                </Card>
-            )}
-        </Card>
-    );
-}
-
-export default JobLifecycleComponent;

client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(
   mapStateToProps,
@@ -113,7 +113,6 @@ export function JobLineConvertToLabor({
         hours: calculateAdjustment({ mod_lbr_ty, job, jobline }).toFixed(1),
         mod_lbr_ty,
       }),
-      type: "jobmodifylbradj",
     });
     setLoading(false);
     setVisibility(false);

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -82,7 +82,7 @@ export default function JobReconciliationBillsTable({
         state.sortedInfo.order,
 
       render: (text, record) => (
-        <Checkbox checked={record.bill.is_credit_memo} />
+        <Checkbox disabled checked={record.bill.is_credit_memo} />
       ),
     },
   ];

client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -1,16 +1,16 @@
+import { useMutation, useLazyQuery } from "@apollo/client";
 import { CheckCircleOutlined } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
 import {
   Button,
   Card,
   Form,
   InputNumber,
+  notification,
   Popover,
   Space,
-  notification,
 } from "antd";
 import moment from "moment";
-import React, { useEffect, useState } from "react";
+import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
@@ -50,7 +50,6 @@ export default function ScoreboardAddButton({
 
   const handleFinish = async (values) => {
     logImEXEvent("job_close_add_to_scoreboard");
-    values.date = moment(values.date).format("YYYY-MM-DD");
 
     setLoading(true);
     let result;
@@ -178,7 +177,7 @@ export default function ScoreboardAddButton({
           return acc + job.lbr_adjustments[val];
         }, 0);
     form.setFieldsValue({
-      date: moment(),
+      date: new moment(),
       bodyhrs: Math.round(v.bodyhrs * 10) / 10,
       painthrs: Math.round(v.painthrs * 10) / 10,
     });

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
 
@@ -32,7 +32,6 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.admin_jobstatuschange(status),
-          type: "admin_jobstatuschange",
         });
         // refetch();
       })
@@ -54,14 +53,12 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
   );
 
   return (
-    <>
-      <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
-        <Button shape="round">
-          <span>{job.status}</span>
+    <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
+      <Button shape="round">
+        <span>{job.status}</span>
 
-          <DownCircleFilled />
-        </Button>
-      </Dropdown>
-    </>
+        <DownCircleFilled />
+      </Button>
+    </Dropdown>
   );
 }

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(
@@ -57,7 +57,6 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
             ? DateTimeFormat(changedAuditFields[key])
             : changedAuditFields[key]
         ),
-        type: "admin_jobfieldchange",
       });
     });
 

client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx

@@ -1,18 +1,34 @@
 import { useMutation } from "@apollo/client";
-import { Button, Space, notification } from "antd";
+import { Button, notification } from "antd";
+import { gql } from "@apollo/client";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import {
-  DELETE_DELIVERY_CHECKLIST,
-  DELETE_INTAKE_CHECKLIST,
-} from "../../graphql/jobs.queries";
-
 export default function JobAdminDeleteIntake({ job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  const [deleteIntake] = useMutation(gql`
+    mutation DELETE_INTAKE($jobId: uuid!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { intakechecklist: null }
+      ) {
+        id
+        intakechecklist
+      }
+    }
+  `);
 
-  const [deleteIntake] = useMutation(DELETE_INTAKE_CHECKLIST);
-  const [deleteDelivery] = useMutation(DELETE_DELIVERY_CHECKLIST);
+  const [DELETE_DELIVERY] = useMutation(gql`
+    mutation DELETE_DELIVERY($jobId: uuid!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { deliverchecklist: null }
+      ) {
+        id
+        deliverchecklist
+      }
+    }
+  `);
 
   const handleDelete = async (values) => {
     setLoading(true);
@@ -34,7 +50,7 @@ export default function JobAdminDeleteIntake({ job }) {
 
   const handleDeleteDelivery = async (values) => {
     setLoading(true);
-    const result = await deleteDelivery({
+    const result = await DELETE_DELIVERY({
       variables: { jobId: job.id },
     });
 
@@ -52,22 +68,12 @@ export default function JobAdminDeleteIntake({ job }) {
 
   return (
     <>
-      <Space wrap>
-        <Button
-          loading={loading}
-          onClick={handleDelete}
-          disabled={!job.intakechecklist}
-        >
-          {t("jobs.labels.deleteintake")}
-        </Button>
-        <Button
-          loading={loading}
-          onClick={handleDeleteDelivery}
-          disabled={!job.deliverychecklist}
-        >
-          {t("jobs.labels.deletedelivery")}
-        </Button>
-      </Space>
+      <Button loading={loading} onClick={handleDelete}>
+        {t("jobs.labels.deleteintake")}
+      </Button>
+      <Button loading={loading} onClick={handleDeleteDelivery}>
+        {t("jobs.labels.deletedelivery")}
+      </Button>
     </>
   );
 }

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -1,5 +1,5 @@
-import { useMutation } from "@apollo/client";
-import { Button, Space, notification } from "antd";
+import { gql, useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -7,11 +7,6 @@ import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import {
-  MARK_JOB_AS_EXPORTED,
-  MARK_JOB_AS_UNINVOICED,
-  MARK_JOB_FOR_REEXPORT,
-} from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
@@ -23,8 +18,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(
   mapStateToProps,
@@ -40,18 +35,58 @@ export function JobAdminMarkReexport({
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [markJobForReexport] = useMutation(gql`
+    mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: null
+        status: "${bodyshop.md_ro_statuses.default_invoiced}"
+        }
+      ) {
+        id
+        date_exported
+        status
+        date_invoiced
+      }
+    }
+  `);
 
-  const [markJobForReexport] = useMutation(MARK_JOB_FOR_REEXPORT);
-  const [markJobExported] = useMutation(MARK_JOB_AS_EXPORTED);
-  const [markJobUninvoiced] = useMutation(MARK_JOB_AS_UNINVOICED);
+  const [markJobExported] = useMutation(gql`
+    mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: $date_exported
+        status: "${bodyshop.md_ro_statuses.default_exported}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+  const [markJobUninvoiced] = useMutation(gql`
+    mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: null
+          date_invoiced: null
+        status: "${bodyshop.md_ro_statuses.default_delivered}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
 
   const handleMarkForExport = async () => {
     setLoading(true);
     const result = await markJobForReexport({
-      variables: {
-        jobId: job.id,
-        default_invoiced: bodyshop.md_ro_statuses.default_invoiced,
-      },
+      variables: { jobId: job.id },
     });
 
     if (!result.errors) {
@@ -59,7 +94,6 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkforreexport(),
-        type: "admin_jobmarkforreexport",
       });
     } else {
       notification["error"]({
@@ -74,11 +108,7 @@ export function JobAdminMarkReexport({
   const handleMarkExported = async () => {
     setLoading(true);
     const result = await markJobExported({
-      variables: {
-        jobId: job.id,
-        date_exported: moment(),
-        default_exported: bodyshop.md_ro_statuses.default_exported,
-      },
+      variables: { jobId: job.id, date_exported: moment() },
     });
 
     await insertExportLog({
@@ -100,7 +130,6 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkexported(),
-        type: "admin_jobmarkexported",
       });
     } else {
       notification["error"]({
@@ -115,10 +144,7 @@ export function JobAdminMarkReexport({
   const handleUninvoice = async () => {
     setLoading(true);
     const result = await markJobUninvoiced({
-      variables: {
-        jobId: job.id,
-        default_delivered: bodyshop.md_ro_statuses.default_delivered,
-      },
+      variables: { jobId: job.id },
     });
 
     if (!result.errors) {
@@ -126,7 +152,6 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobuninvoice(),
-        type: "admin_jobuninvoice",
       });
     } else {
       notification["error"]({
@@ -140,29 +165,27 @@ export function JobAdminMarkReexport({
 
   return (
     <>
-      <Space wrap>
-        <Button
-          loading={loading}
-          disabled={!job.date_exported}
-          onClick={handleMarkForExport}
-        >
-          {t("jobs.labels.markforreexport")}
-        </Button>
-        <Button
-          loading={loading}
-          disabled={job.date_exported}
-          onClick={handleMarkExported}
-        >
-          {t("jobs.actions.markasexported")}
-        </Button>
-        <Button
-          loading={loading}
-          disabled={!job.date_invoiced || job.date_exported}
-          onClick={handleUninvoice}
-        >
-          {t("jobs.actions.uninvoice")}
-        </Button>
-      </Space>
+      <Button
+        loading={loading}
+        disabled={!job.date_exported}
+        onClick={handleMarkForExport}
+      >
+        {t("jobs.labels.markforreexport")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={job.date_exported}
+        onClick={handleMarkExported}
+      >
+        {t("jobs.actions.markasexported")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={!job.date_invoiced || job.date_exported}
+        onClick={handleUninvoice}
+      >
+        {t("jobs.actions.uninvoice")}
+      </Button>
     </>
   );
 }

client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx

@@ -1,66 +0,0 @@
-import { useMutation } from "@apollo/client";
-import { Switch, notification } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { UPDATE_REMOVE_FROM_AR } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-
-const mapStateToProps = createStructuredSelector({});
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminRemoveAR);
-
-export function JobsAdminRemoveAR({ insertAuditTrail, job }) {
-  const { t } = useTranslation();
-  const [loading, setLoading] = useState(false);
-  const [switchValue, setSwitchValue] = useState(job.remove_from_ar);
-
-  const [mutationUpdateRemoveFromAR] = useMutation(UPDATE_REMOVE_FROM_AR);
-
-  const handleChange = async (value) => {
-    setLoading(true);
-    const result = await mutationUpdateRemoveFromAR({
-      variables: { jobId: job.id, remove_from_ar: value },
-    });
-
-    if (!result.errors) {
-      notification["success"]({ message: t("jobs.successes.save") });
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.admin_job_remove_from_ar(value),
-        type: "admin_job_remove_from_ar",
-      });
-      setSwitchValue(value);
-    } else {
-      notification["error"]({
-        message: t("jobs.errors.saving", {
-          error: JSON.stringify(result.errors),
-        }),
-      });
-    }
-    setLoading(false);
-  };
-
-  return (
-    <>
-      <div style={{ display: "flex", alignItems: "center" }}>
-        <div style={{ marginRight: "10px" }}>
-          {t("jobs.labels.remove_from_ar")}:
-        </div>
-        <div>
-          <Switch
-            checked={switchValue}
-            loading={loading}
-            onChange={handleChange}
-          />
-        </div>
-      </div>
-    </>
-  );
-}

client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx

@@ -1,10 +1,9 @@
-import { useMutation } from "@apollo/client";
+import { gql, useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { UNVOID_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
@@ -17,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
@@ -30,17 +29,66 @@ export function JobsAdminUnvoid({
 }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [mutationUnvoidJob] = useMutation(UNVOID_JOB);
+  const [updateJob] = useMutation(gql`
+mutation UNVOID_JOB($jobId: uuid!) {
+  update_jobs_by_pk(pk_columns: {id: $jobId}, _set: {voided: false, status: "${
+    bodyshop.md_ro_statuses.default_imported
+  }", date_void: null}) {
+    id
+    date_void
+    voided
+    status
+  }
+  insert_notes(objects: {jobid: $jobId, audit: true, created_by: "${
+    currentUser.email
+  }", text: "${t("jobs.labels.unvoidnote")}"}) {
+    returning {
+      id
+    }
+  }
+}
+
+  `);
+
+  //       const result = await voidJob({
+  //     variables: {
+  //       jobId: job.id,
+  //       job: {
+  //         status: bodyshop.md_ro_statuses.default_void,
+  //         voided: true,
+  //       },
+  //       note: [
+  //         {
+  //           jobid: job.id,
+  //           created_by: currentUser.email,
+  //           audit: true,
+  //           text: t("jobs.labels.voidnote", {
+  //             date: moment().format("MM/DD/yyy"),
+  //             time: moment().format("hh:mm a"),
+  //           }),
+  //         },
+  //       ],
+  //     },
+  //   });
+
+  //   if (!!!result.errors) {
+  //     notification["success"]({
+  //       message: t("jobs.successes.voided"),
+  //     });
+  //     //go back to jobs list.
+  //     history.push(`/manage/`);
+  //   } else {
+  //     notification["error"]({
+  //       message: t("jobs.errors.voiding", {
+  //         error: JSON.stringify(result.errors),
+  //       }),
+  //     });
+  //   }
 
   const handleUpdate = async (values) => {
     setLoading(true);
-    const result = await mutationUnvoidJob({
-      variables: {
-        jobId: job.id,
-        default_imported: bodyshop.md_ro_statuses.default_imported,
-        currentUserEmail: currentUser.email,
-        text: t("jobs.labels.unvoidnote"),
-      },
+    const result = await updateJob({
+      variables: { jobId: job.id },
     });
 
     if (!result.errors) {
@@ -49,7 +97,6 @@ export function JobsAdminUnvoid({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobunvoid(),
-        type: "admin_jobunvoid",
       });
     } else {
       notification["error"]({
@@ -63,10 +110,8 @@ export function JobsAdminUnvoid({
   };
 
   return (
-    <>
-      <Button loading={loading} disabled={!job.voided} onClick={handleUpdate}>
-        {t("jobs.actions.unvoid")}
-      </Button>
-    </>
+    <Button loading={loading} disabled={!job.voided} onClick={handleUpdate}>
+      {t("jobs.actions.unvoid")}
+    </Button>
   );
 }

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -6,10 +6,10 @@ import {
   useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Col, Row, notification } from "antd";
+import { Col, notification, Row } from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
-import moment from "moment-business-days";
+import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -30,8 +30,8 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import confirmDialog from "../../utils/asyncConfirm";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CriticalPartsScan from "../../utils/criticalPartsScan";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -47,8 +47,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export function JobsAvailableContainer({
   bodyshop,
@@ -73,15 +73,7 @@ export function JobsAvailableContainer({
 
   const [selectedJob, setSelectedJob] = useState(null);
   const [selectedOwner, setSelectedOwner] = useState(null);
-  const [partsQueueToggle, setPartsQueueToggle] = useState(
-    bodyshop.md_functionality_toggles.parts_queue_toggle
-  );
-  const [updateSchComp, setSchComp] = useState({
-    actual_in: moment(),
-    checked: false,
-    scheduled_completion: moment(),
-    automatic: false,
-  });
+  const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
 
   const [insertLoading, setInsertLoading] = useState(false);
 
@@ -190,7 +182,6 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: r.data.insert_jobs.returning[0].id,
         operation: AuditTrailMapping.jobimported(),
-        type: "jobimported",
       });
 
       deleteJob({
@@ -206,16 +197,11 @@ export function JobsAvailableContainer({
       notification["error"]({
         message: t("jobs.errors.creating", { error: err.message }),
       });
-      refetch().catch((e) => {
-        console.error(
-          `Something went wrong in jobs available table container - ${
-            err.message || ""
-          }`
-        );
-      });
+      refetch().catch(e => {console.error(`Something went wrong in jobs available table container - ${err.message || ''}`)});
       setInsertLoading(false);
       setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
     }
+
   };
 
   //Supplement scenario
@@ -239,22 +225,6 @@ export function JobsAvailableContainer({
       //IO-539 Check for Parts Rate on PAL for SGI use case.
       await CheckTaxRates(supp, bodyshop);
 
-      if (updateSchComp.checked === true) {
-        if (updateSchComp.automatic === true) {
-          const job_hrs = supp.joblines.data.reduce(
-            (acc, val) => acc + val.mod_lb_hrs,
-            0
-          );
-          const num_days = job_hrs / bodyshop.target_touchtime;
-          supp.actual_in = updateSchComp.actual_in;
-          supp.scheduled_completion = moment(
-            updateSchComp.actual_in
-          ).businessAdd(num_days, "days");
-        } else {
-          supp.scheduled_completion = updateSchComp.scheduled_completion;
-        }
-      }
-
       delete supp.owner;
       delete supp.vehicle;
       delete supp.ins_co_nm;
@@ -291,9 +261,9 @@ export function JobsAvailableContainer({
         },
       });
 
-      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+        setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
 
-      if (CriticalPartsScanning.treatment === "on") {
+        if (CriticalPartsScanning.treatment === "on") {
         CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
       }
       if (updateResult.errors) {
@@ -351,7 +321,6 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: selectedJob,
         operation: AuditTrailMapping.jobsupplement(),
-        type: "jobsupplement",
       });
     }
   };
@@ -398,6 +367,7 @@ export function JobsAvailableContainer({
 
   if (error) return <AlertComponent type="error" message={error.message} />;
 
+
   return (
     <LoadingSpinner
       loading={insertLoading}
@@ -414,6 +384,7 @@ export function JobsAvailableContainer({
         visible={ownerModalVisible}
         onOk={onOwnerFindModalOk}
         onCancel={onOwnerModalCancel}
+
       />
       <JobsFindModalContainer
         loading={estDataRaw.loading}
@@ -427,8 +398,6 @@ export function JobsAvailableContainer({
         modalSearchState={modalSearchState}
         partsQueueToggle={partsQueueToggle}
         setPartsQueueToggle={setPartsQueueToggle}
-        updateSchComp={updateSchComp}
-        setSchComp={setSchComp}
       />
       <Row gutter={[16, 16]}>
         <Col span={24}>

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
@@ -35,7 +35,6 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.jobstatuschange(status),
-          type: "jobstatuschange",
         });
         // refetch();
       })

client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx

@@ -9,12 +9,10 @@ import { createStructuredSelector } from "reselect";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
@@ -22,11 +20,6 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
-});
-
 function updateJobCache(items) {
   client.cache.modify({
     id: "ROOT_QUERY",
@@ -47,7 +40,6 @@ export function JobsCloseExportButton({
   disabled,
   setSelectedJobs,
   refetch,
-  insertAuditTrail,
 }) {
   const history = useHistory();
   const { t } = useTranslation();
@@ -189,11 +181,6 @@ export function JobsCloseExportButton({
             key: "jobsuccessexport",
             message: t("jobs.successes.exported"),
           });
-          insertAuditTrail({
-            jobid: jobId,
-            operation: AuditTrailMapping.jobexported(),
-            type: "jobexported",
-          });
           updateJobCache(
             jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
           );
@@ -205,21 +192,12 @@ export function JobsCloseExportButton({
           });
         }
       }
-      if (
-        bodyshop.accountingconfig &&
-        bodyshop.accountingconfig.qbo &&
-        successfulTransactions.length > 0
-      ) {
+      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
         notification.open({
           type: "success",
           key: "jobsuccessexport",
           message: t("jobs.successes.exported"),
         });
-        insertAuditTrail({
-          jobid: jobId,
-          operation: AuditTrailMapping.jobexported(),
-          type: "jobexported",
-        });
         updateJobCache([
           ...new Set(
             successfulTransactions.map(
@@ -249,7 +227,4 @@ export function JobsCloseExportButton({
   );
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsCloseExportButton);
+export default connect(mapStateToProps, null)(JobsCloseExportButton);

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -25,8 +25,8 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsConvertButton({
@@ -78,7 +78,6 @@ export function JobsConvertButton({
         operation: AuditTrailMapping.jobconverted(
           res.data.update_jobs.returning[0].ro_number
         ),
-        type: "jobconverted",
       });
 
       setVisible(false);

client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx

@@ -19,13 +19,10 @@ export default function JobsCreateOwnerInfoNewComponent() {
           label={t("owners.fields.ownr_ln")}
           name={["owner", "data", "ownr_ln"]}
           rules={[
-            ({ getFieldValue }) => ({
-              required:
-                state.owner.new &&
-                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
-                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
+            {
+              required: state.owner.new,
               //message: t("general.validation.required"),
-            }),
+            },
           ]}
         >
           <Input disabled={!state.owner.new} />
@@ -34,13 +31,10 @@ export default function JobsCreateOwnerInfoNewComponent() {
           label={t("owners.fields.ownr_fn")}
           name={["owner", "data", "ownr_fn"]}
           rules={[
-            ({ getFieldValue }) => ({
-              required:
-                state.owner.new &&
-                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
-                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
+            {
+              required: state.owner.new,
               //message: t("general.validation.required"),
-            }),
+            },
           ]}
         >
           <Input disabled={!state.owner.new} />
@@ -57,17 +51,6 @@ export default function JobsCreateOwnerInfoNewComponent() {
         <Form.Item
           label={t("owners.fields.ownr_co_nm")}
           name={["owner", "data", "ownr_co_nm"]}
-          rules={[
-            ({ getFieldValue }) => ({
-              required:
-                state.owner.new &&
-                (!getFieldValue(["owner", "data", "ownr_ln"]) ||
-                  !getFieldValue(["owner", "data", "ownr_fn"]) ||
-                  getFieldValue(["owner", "data", "ownr_ln"]) === "" ||
-                  getFieldValue(["owner", "data", "ownr_fn"]) === ""),
-              //message: t("general.validation.required"),
-            }),
-          ]}
         >
           <Input disabled={!state.owner.new} />
         </Form.Item>

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -29,7 +29,6 @@ export default function AddToProduction(
         insertAuditTrail({
           jobid: jobId,
           operation: AuditTrailMapping.jobinproductionchange(!remove),
-          type: "jobinproductionchange",
         })
       );
       if (completionCallback) completionCallback();

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -52,8 +52,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "timeTicket" })),
   setCardPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "cardPayment" })),
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsDetailHeaderActions({
@@ -108,15 +108,6 @@ export function JobsDetailHeaderActions({
         },
       },
     });
-    insertAuditTrail({
-      jobid: job.id,
-      operation: AuditTrailMapping.alertToggle(
-        !!job.production_vars && !!job.production_vars.alert
-          ? !job.production_vars.alert
-          : true
-      ),
-      type: "alertToggle",
-    });
   };
 
   const handleSuspend = (e) => {
@@ -130,13 +121,6 @@ export function JobsDetailHeaderActions({
         },
       },
     });
-    insertAuditTrail({
-      jobid: job.id,
-      operation: AuditTrailMapping.jobsuspend(
-        !!job.suspended ? !job.suspended : true
-      ),
-      type: "jobsuspend",
-    });
   };
 
   const statusmenu = (
@@ -192,7 +176,6 @@ export function JobsDetailHeaderActions({
                       jobid: job.id,
                       operation:
                         AuditTrailMapping.appointmentcancel(lost_sale_reason),
-                      type: "appointmentcancel",
                     });
                     return;
                   }
@@ -549,11 +532,6 @@ export function JobsDetailHeaderActions({
                   notification["success"]({
                     message: t("jobs.successes.voided"),
                   });
-                  insertAuditTrail({
-                    jobid: job.id,
-                    operation: AuditTrailMapping.jobvoid(),
-                    type: "jobvoid",
-                  });
                   //go back to jobs list.
                   history.push(`/manage/`);
                 } else {

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -1,10 +1,10 @@
 import {
-  BranchesOutlined,
   ExclamationCircleFilled,
   PauseCircleOutlined,
   WarningFilled,
+  BranchesOutlined,
 } from "@ant-design/icons";
-import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -15,7 +15,6 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
@@ -26,7 +25,6 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
-import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -63,13 +61,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
   ${job.v_make_desc || ""} 
   ${job.v_model_desc || ""}`.trim();
 
-  const bodyHrs = job.joblines
-    .filter((j) => j.mod_lbr_ty !== "LAR")
-    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
-  const refinishHrs = job.joblines
-    .filter((line) => line.mod_lbr_ty === "LAR")
-    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
-
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
   return (
@@ -101,9 +92,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                 job.scheduled_in ? (
                   <Tag>
-                    <Link to={`/manage/schedule?date=${moment(job.scheduled_in).format('YYYY-MM-DD')}`}>
-                      <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
-                    </Link>
+                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
                   </Tag>
                 ) : null}
               </Space>
@@ -133,23 +122,20 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             </DataLabel>
             {job.cccontracts.length > 0 && (
               <DataLabel label={t("jobs.labels.contracts")}>
-                {job.cccontracts.map((c, index) => (
-                  <Space wrap>
-                    <Link
-                      key={c.id}
-                      to={`/manage/courtesycars/contracts/${c.id}`}
-                    >
-                      {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
-                      {index !== job.cccontracts.length - 1 ? "," : null}
-                    </Link>
-                  </Space>
+                {job.cccontracts.map((c) => (
+                  <Link
+                    key={c.id}
+                    to={`/manage/courtesycars/contracts/${c.id}`}
+                  >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}</Link>
                 ))}
               </DataLabel>
             )}
+
             <DataLabel label={t("jobs.fields.production_vars.note")}>
               <ProductionListColumnProductionNote record={job} />
             </DataLabel>
-            <Space wrap>
+
+            <Space>
               {job.special_coverage_policy && (
                 <Tag color="tomato">
                   <Space>
@@ -174,35 +160,19 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
         <Card
           style={{ height: "100%" }}
           title={
-            disabled ? (
-              <>
-                {ownerTitle.length > 0
-                  ? ownerTitle
-                  : t("owner.labels.noownerinfo")}
-              </>
-            ) : (
-              <Link to={`/manage/owners/${job.owner.id}`}>
-                {ownerTitle.length > 0
-                  ? ownerTitle
-                  : t("owner.labels.noownerinfo")}
-              </Link>
-            )
+            <Link to={disabled ? "#" : `/manage/owners/${job.owner.id}`}>
+              {ownerTitle.length > 0
+                ? ownerTitle
+                : t("owner.labels.noownerinfo")}
+            </Link>
           }
         >
           <div>
             <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
-              {disabled ? (
-                <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
-              ) : (
-                <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
-              )}
+              <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
             </DataLabel>
             <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
-              {disabled ? (
-                <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
-              ) : (
-                <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
-              )}
+              <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
             </DataLabel>
             <DataLabel key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -210,11 +180,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
             </DataLabel>
             <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
-              {disabled ? (
-                <>{job.ownr_ea || ""}</>
-              ) : job.ownr_ea ? (
-                <a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
-              ) : null}
+              {job.ownr_ea || ""}
             </DataLabel>
             {job.owner?.tax_number && (
               <DataLabel key="5" label={t("owners.fields.tax_number")}>
@@ -229,19 +195,17 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
           style={{ height: "100%" }}
           title={
             job.vehicle ? (
-              disabled ? (
-                <>
-                  {vehicleTitle.length > 0
-                    ? vehicleTitle
-                    : t("vehicles.labels.novehinfo")}{" "}
-                </>
-              ) : (
-                <Link to={job.vehicle && `/manage/vehicles/${job.vehicle.id}`}>
-                  {vehicleTitle.length > 0
-                    ? vehicleTitle
-                    : t("vehicles.labels.novehinfo")}
-                </Link>
-              )
+              <Link
+                to={
+                  disabled
+                    ? "#"
+                    : job.vehicle && `/manage/vehicles/${job.vehicle.id}`
+                }
+              >
+                {vehicleTitle.length > 0
+                  ? vehicleTitle
+                  : t("vehicles.labels.novehinfo")}
+              </Link>
             ) : (
               <span></span>
             )
@@ -257,19 +221,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <VehicleVinDisplay>
                 {`${job.v_vin || t("general.labels.na")}`}
               </VehicleVinDisplay>
-              {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
-                job.v_vin?.length !== 17 ? (
-                  <WarningFilled
-                    style={{ color: "tomato", marginLeft: ".3rem" }}
-                  />
-                ) : null
-              ) : null}
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.regie_number")}>
-              {job.regie_number || t("general.labels.na")}
             </DataLabel>
             <DataLabel label={t("jobs.labels.relatedros")}>
-              <JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
+              <JobsRelatedRos jobid={job.id} job={job} />
             </DataLabel>
             {job.vehicle && job.vehicle.notes && (
               <DataLabel
@@ -309,11 +263,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
         >
           <div>
             <JobEmployeeAssignments job={job} />
-            <Divider style={{ margin: ".5rem" }} />
-            <DataLabel label={t("jobs.labels.labor_hrs")}>
-              {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} /{" "}
-              {(bodyHrs + refinishHrs).toFixed(1)}
-            </DataLabel>
           </div>
         </Card>
       </Col>

client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx

@@ -9,12 +9,10 @@ import { createStructuredSelector } from "reselect";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOBS } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
@@ -22,11 +20,6 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
-});
-
 function updateJobCache(items) {
   client.cache.modify({
     id: "ROOT_QUERY",
@@ -48,7 +41,6 @@ export function JobsExportAllButton({
   loadingCallback,
   completedCallback,
   refetch,
-  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOBS);
@@ -185,13 +177,6 @@ export function JobsExportAllButton({
                 key: "jobsuccessexport",
                 message: t("jobs.successes.exported"),
               });
-              jobUpdateResponse.data.update_jobs.returning.forEach((job) => {
-                insertAuditTrail({
-                  jobid: job.id,
-                  operation: AuditTrailMapping.jobexported(),
-                  type: "jobexported",
-                });
-              });
               updateJobCache(
                 jobUpdateResponse.data.update_jobs.returning.map(
                   (job) => job.id
@@ -205,17 +190,13 @@ export function JobsExportAllButton({
               });
             }
           }
-          if (
-            bodyshop.accountingconfig &&
-            bodyshop.accountingconfig.qbo &&
-            successfulTransactions.length > 0
-          ) {
+          if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
             notification.open({
               type: "success",
               key: "jobsuccessexport",
               message: t("jobs.successes.exported"),
             });
-            const successfulTransactionsSet = [
+            updateJobCache([
               ...new Set(
                 successfulTransactions.map(
                   (st) =>
@@ -226,15 +207,7 @@ export function JobsExportAllButton({
                     ]
                 )
               ),
-            ];
-            if (successfulTransactionsSet.length > 0) {
-              insertAuditTrail({
-                jobid: successfulTransactionsSet[0],
-                operation: AuditTrailMapping.jobexported(),
-                type: "jobexported",
-              });
-            }
-            updateJobCache(successfulTransactionsSet);
+            ]);
           }
         }
       })
@@ -252,7 +225,4 @@ export function JobsExportAllButton({
   );
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsExportAllButton);
+export default connect(mapStateToProps, null)(JobsExportAllButton);

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

@@ -1,11 +1,9 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Checkbox, Divider, Input, Space, Table } from "antd";
-import moment from "moment";
-import React, { useState } from "react";
+import { Checkbox, Divider, Input, Table, Button } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function JobsFindModalComponent({
@@ -18,13 +16,11 @@ export default function JobsFindModalComponent({
   jobsListRefetch,
   partsQueueToggle,
   setPartsQueueToggle,
-  updateSchComp,
-  setSchComp,
 }) {
   const { t } = useTranslation();
   const [modalSearch, setModalSearch] = modalSearchState;
   const [importOptions, setImportOptions] = importOptionsState;
-  const [checkUTT, setCheckUTT] = useState(false);
+
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -146,35 +142,6 @@ export default function JobsFindModalComponent({
     if (record) {
       if (record.id) {
         setSelectedJob(record.id);
-        if (record.actual_in && record.scheduled_completion) {
-          setSchComp({
-            ...updateSchComp,
-            actual_in: record.actual_in,
-            scheduled_completion: record.scheduled_completion,
-          });
-        } else {
-          if (record.actual_in && !record.scheduled_completion) {
-            setSchComp({
-              ...updateSchComp,
-              actual_in: record.actual_in,
-              scheduled_completion: moment(),
-            });
-          }
-          if (!record.actual_in && record.scheduled_completion) {
-            setSchComp({
-              ...updateSchComp,
-              actual_in: moment(),
-              scheduled_completion: moment(record.scheduled_completion),
-            });
-          }
-          if (!record.actual_in && !record.scheduled_completion) {
-            setSchComp({
-              ...updateSchComp,
-              actual_in: moment(),
-              scheduled_completion: moment(),
-            });
-          }
-        }
         return;
       }
     }
@@ -210,35 +177,6 @@ export default function JobsFindModalComponent({
         rowSelection={{
           onSelect: (props) => {
             setSelectedJob(props.id);
-            if (props.actual_in && props.scheduled_completion) {
-              setSchComp({
-                ...updateSchComp,
-                actual_in: props.actual_in,
-                scheduled_completion: props.scheduled_completion,
-              });
-            } else {
-              if (props.actual_in && !props.scheduled_completion) {
-                setSchComp({
-                  ...updateSchComp,
-                  actual_in: props.actual_in,
-                  scheduled_completion: moment(),
-                });
-              }
-              if (!props.actual_in && props.scheduled_completion) {
-                setSchComp({
-                  ...updateSchComp,
-                  actual_in: moment(),
-                  scheduled_completion: moment(props.scheduled_completion),
-                });
-              }
-              if (!props.actual_in && !props.scheduled_completion) {
-                setSchComp({
-                  ...updateSchComp,
-                  actual_in: moment(),
-                  scheduled_completion: moment(),
-                });
-              }
-            }
           },
           type: "radio",
           selectedRowKeys: [selectedJob],
@@ -252,58 +190,23 @@ export default function JobsFindModalComponent({
         }}
       />
       <Divider />
-      <Space>
-        <Checkbox
-          defaultChecked={importOptions.overrideHeader}
-          onChange={(e) =>
-            setImportOptions({
-              ...importOptions,
-              overrideHeaders: e.target.checked,
-            })
-          }
-        >
-          {t("jobs.labels.override_header")}
-        </Checkbox>
-        <Checkbox
+      <Checkbox
+        defaultChecked={importOptions.overrideHeader}
+        onChange={(e) =>
+          setImportOptions({
+            ...importOptions,
+            overrideHeaders: e.target.checked,
+          })
+        }
+      >
+        {t("jobs.labels.override_header")}
+      </Checkbox>
+      <Checkbox
           checked={partsQueueToggle}
           onChange={(e) => setPartsQueueToggle(e.target.checked)}
-        >
-          {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
-        </Checkbox>
-        <Checkbox
-          checked={updateSchComp.checked}
-          onChange={(e) =>
-            setSchComp({ ...updateSchComp, checked: e.target.checked })
-          }
-        >
-          {t("jobs.labels.update_scheduled_completion")}
-        </Checkbox>
-        {updateSchComp.checked === true ? (
-          <>
-            {checkUTT === false ? (
-              <FormDateTimePickerComponent
-                value={updateSchComp.scheduled_completion}
-                onChange={(e) => {
-                  setSchComp({ ...updateSchComp, scheduled_completion: e });
-                }}
-              />
-            ) : null}
-            <Checkbox
-              checked={checkUTT}
-              onChange={(e) => {
-                setCheckUTT(e.target.checked);
-                setSchComp({
-                  ...updateSchComp,
-                  scheduled_completion: null,
-                  automatic: true,
-                });
-              }}
-            >
-              {t("jobs.labels.calc_scheuled_completion")}
-            </Checkbox>
-          </>
-        ) : null}
-      </Space>
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

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

@@ -26,8 +26,6 @@ export default connect(
   modalSearchState,
   partsQueueToggle,
   setPartsQueueToggle,
-  updateSchComp,
-  setSchComp,
   ...modalProps
 }) {
   const { t } = useTranslation();
@@ -97,8 +95,6 @@ export default connect(
           modalSearchState={modalSearchState}
           partsQueueToggle={partsQueueToggle}
           setPartsQueueToggle={setPartsQueueToggle}
-          updateSchComp={updateSchComp}
-          setSchComp={setSchComp}
         />
       ) : null}
     </Modal>

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -10,10 +10,9 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { pageLimit } from "../../utils/config";
-import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -26,7 +25,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
   const search = queryString.parse(useLocation().search);
   const [openSearchResults, setOpenSearchResults] = useState([]);
   const [searchLoading, setSearchLoading] = useState(false);
-  const [filter, setFilter] = useLocalStorage("filter_jobs_all", null);
   const { page, sortcolumn, sortorder } = search;
   const history = useHistory();
 
@@ -95,7 +93,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       render: (text, record) => {
         return record.status || t("general.labels.na");
       },
-      filteredValue: filter?.status || null,
       filters: bodyshop.md_ro_statuses.statuses.map((s) => {
         return { text: s, value: [s] };
       }),
@@ -192,7 +189,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
     } else {
       delete search.statusFilters;
     }
-    setFilter(filters);
     history.push({ search: queryString.stringify(search) });
   };
 

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

@@ -1,424 +1,426 @@
-import {
-  BranchesOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-  SyncOutlined,
-} from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
-import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
+import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined,} from "@ant-design/icons";
+import {useQuery} from "@apollo/client";
+import {Button, Card, Grid, Input, Space, Table, Tooltip, Typography} from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { Link, useHistory, useLocation } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {Link, useHistory, useLocation} from "react-router-dom";
+import {createStructuredSelector} from "reselect";
+import {QUERY_ALL_ACTIVE_JOBS_PAGINATED} from "../../graphql/jobs.queries";
+import {selectBodyshop} from "../../redux/user/user.selectors";
+import {onlyUnique} from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { onlyUnique } from "../../utils/arrayHelper";
-import { alphaSort, statusSort } from "../../utils/sorters";
-import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
+import {flattenDeep} from "lodash";
+import { pageLimit } from '../../utils/config';
+import axios from "axios";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+    bodyshop: selectBodyshop,
 });
 
-export function JobsList({ bodyshop }) {
-  const searchParams = queryString.parse(useLocation().search);
-  const { selected } = searchParams;
-  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
-    .filter((screen) => !!screen[1])
-    .slice(-1)[0];
-  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
-    variables: {
-      statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
-    },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
+const mapDispatchToProps = () => ({
+});
 
-  const [state, setState] = useState({ sortedInfo: {} });
-  const [filter, setFilter] = useLocalStorage("filter_jobs_list", null);
+export function JobsList({bodyshop,}) {
+    const search = queryString.parse(useLocation().search);
+    const [openSearchResults, setOpenSearchResults] = useState([]);
+    const [searchLoading, setSearchLoading] = useState(false);
+    const {page, selected, sortorder, sortcolumn,statusFilters} = search;
 
-  const { t } = useTranslation();
-  const history = useHistory();
-  const [searchText, setSearchText] = useState("");
+    const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+        .filter((screen) => !!screen[1])
+        .slice(-1)[0];
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
+    const {loading, error, data, refetch} = useQuery(QUERY_ALL_ACTIVE_JOBS_PAGINATED, {
+        variables: {
+            offset: page ? (page - 1) * pageLimit : 0,
+            limit: pageLimit,
+            statusFilters: statusFilters ? JSON.parse(statusFilters) : bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
+            order: [
+                {
+                    [sortcolumn || "ro_number"]:
+                        sortorder && sortorder !== "false"
+                            ? (sortorder === "descend"
+                                ? "desc"
+                                : "asc")
+                            : "desc",
+                },
+            ],
+        },
+        fetchPolicy: "network-only",
+        nextFetchPolicy: "network-only",
+    });
 
-  const jobs = data
-    ? searchText === ""
-      ? data.jobs
-      : data.jobs.filter(
-          (j) =>
-            (j.ro_number || "")
-              .toString()
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_co_nm || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.comments || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_fn || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_ln || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
-            (j.plate_no || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.v_model_desc || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.est_ct_fn || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.est_ct_ln || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.v_make_desc || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase())
-        )
-    : [];
+    const total = data?.jobs_aggregate?.aggregate?.count || 0;
 
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, sortedInfo: sorter });
-    setFilter(filters);
-  };
+    const [state, setState] = useState({
+        filteredInfo: {text: ""},
+    });
 
-  const handleOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        history.push({
-          search: queryString.stringify({
-            ...searchParams,
-            selected: record.id,
-          }),
-        });
-      }
+    const {t} = useTranslation();
+    const history = useHistory();
+
+    const jobs = data?.jobs || [];
+
+    const handleTableChange = (pagination, filters, sorter) => {
+        search.page = pagination.current;
+        search.sortcolumn = sorter.column && sorter.column.key;
+        search.sortorder = sorter.order;
+
+        if (filters.status) {
+            search.statusFilters = JSON.stringify(flattenDeep(filters.status));
+        } else {
+            delete search.statusFilters;
+        }
+
+        history.push({search: queryString.stringify(search)});
+    };
+
+    useEffect(() => {
+        if (search.search && search.search.trim() !== "") {
+            searchJobs().catch(e => {
+                console.error('Something went wrong searching for jobs in the job-list component', e);
+            });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    if (error) return <AlertComponent message={error.message} type="error"/>;
+
+    async function searchJobs(value) {
+        try {
+            setSearchLoading(true);
+            const searchData = await axios.post("/search", {
+                search: value || search.search,
+                index: "jobs",
+            });
+            setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
+        } catch (error) {
+            console.log("Error while fetching search results", error);
+        } finally {
+            setSearchLoading(false);
+        }
     }
-  };
 
-  const columns = [
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) =>
-        parseInt((a.ro_number || "0").replace(/\D/g, "")) -
-        parseInt((b.ro_number || "0").replace(/\D/g, "")),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.id}
-          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,
-      responsive: ["md"],
-      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} />
+    const handleOnRowClick = (record) => {
+        if (record) {
+            if (record.id) {
+                history.push({
+                    search: queryString.stringify({
+                        ...search,
+                        selected: record.id,
+                    }),
+                });
+            }
+        }
+    };
+
+    const columns = [
+        {
+            title: t("jobs.fields.ro_number"),
+            dataIndex: "ro_number",
+            key: "ro_number",
+            sorter: true,
+            sortOrder:
+                sortcolumn === "ro_number" && sortorder,
+
+            render: (text, record) => (
+                <Link
+                    to={"/manage/jobs/" + record.id}
+                    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,
+            responsive: ["md"],
+            sorter: false,
+            sortOrder: sortcolumn === "owner" && sortorder,
+            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("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ph2"),
-      dataIndex: "ownr_ph2",
-      key: "ownr_ph2",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
-      ),
-    },
-    {
-      title: t("jobs.fields.status"),
-      dataIndex: "status",
-      key: "status",
-      ellipsis: true,
-      sorter: (a, b) =>
-        statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filteredValue: filter?.status || null,
-      filters:
-        (jobs &&
-          jobs
-            .map((j) => j.status)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Status*",
-                value: [s],
-              };
-            })
-            .sort((a, b) =>
-              statusSort(
-                a.text,
-                b.text,
-                bodyshop.md_ro_statuses.active_statuses
-              )
-            )) ||
-        [],
-      onFilter: (value, record) => value.includes(record.status),
-    },
-
-    {
-      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("vehicles.fields.plate_no"),
-      dataIndex: "plate_no",
-      key: "plate_no",
-      ellipsis: true,
-
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
-    },
-    {
-      title: t("jobs.fields.clm_no"),
-      dataIndex: "clm_no",
-      key: "clm_no",
-      ellipsis: true,
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
-      render: (text, record) =>
-        `${record.clm_no || ""}${
-          record.po_number ? ` (PO: ${record.po_number})` : ""
-        }`,
-    },
-    {
-      title: t("jobs.fields.ins_co_nm"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
-      sortOrder:
-        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
-      filteredValue: filter?.ins_co_nm || null,
-      filters:
-        (jobs &&
-          jobs
-            .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),
-      responsive: ["md"],
-    },
-    {
-      title: t("jobs.fields.clm_total"),
-      dataIndex: "clm_total",
-      key: "clm_total",
-      responsive: ["md"],
-      ellipsis: true,
-      sorter: (a, b) => a.clm_total - b.clm_total,
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
-      render: (text, record) => (
-        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
-      ),
-    },
-    {
-      title: t("jobs.labels.estimator"),
-      dataIndex: "jobs.labels.estimator",
-      key: "estimator",
-      ellipsis: true,
-      responsive: ["xl"],
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
-          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
-      filterSearch: true,
-      filteredValue: filter?.estimator || null,
-      filters:
-        (jobs &&
-          jobs
-            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Estimator*",
-                value: [s],
-              };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
-        [],
-      onFilter: (value, record) =>
-        value.includes(
-          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
-        ),
-      render: (text, record) =>
-        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
-    },
-    {
-      title: t("jobs.fields.comment"),
-      dataIndex: "comment",
-      key: "comment",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    // {
-    //   title: t("jobs.fields.owner_owing"),
-    //   dataIndex: "owner_owing",
-    //   key: "owner_owing",
-    //   responsive: ["md"],
-    //   render: (text, record) => (
-    //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
-    //   ),
-    // },
-  ];
-
-  const scrollMapper = {
-    xs: true,
-    sm: true,
-    md: true,
-    lg: "100%",
-    xl: "100%",
-    xxl: "100%",
-  };
-
-  return (
-    <Card
-      title={t("titles.bc.jobs-active")}
-      extra={
-        <Space wrap>
-          <Button onClick={() => refetch()}>
-            <SyncOutlined />
-          </Button>
-          <Input.Search
-            placeholder={t("general.labels.search")}
-            onChange={(e) => {
-              setSearchText(e.target.value);
-            }}
-            value={searchText}
-            enterButton
-          />
-        </Space>
-      }
-    >
-      <Table
-        loading={loading}
-        pagination={{ defaultPageSize: 50 }}
-        columns={columns}
-        rowKey="id"
-        dataSource={jobs}
-        scroll={{
-          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
-        }}
-        rowSelection={{
-          onSelect: (record) => {
-            handleOnRowClick(record);
-          },
-          selectedRowKeys: [selected],
-          type: "radio",
-        }}
-        onChange={handleTableChange}
-        onRow={(record, rowIndex) => {
-          return {
-            onClick: (event) => {
-              handleOnRowClick(record);
+                );
             },
-          };
-        }}
-      />
-    </Card>
-  );
+        },
+        {
+            title: t("jobs.fields.ownr_ph1"),
+            dataIndex: "ownr_ph1",
+            key: "ownr_ph1",
+            ellipsis: true,
+            responsive: ["md"],
+            render: (text, record) => (
+                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id}/>
+            ),
+        },
+        {
+            title: t("jobs.fields.ownr_ph2"),
+            dataIndex: "ownr_ph2",
+            key: "ownr_ph2",
+            ellipsis: true,
+            responsive: ["md"],
+            render: (text, record) => (
+                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id}/>
+            ),
+        },
+
+        {
+            title: t("jobs.fields.status"),
+            dataIndex: "status",
+            key: "status",
+            ellipsis: true,
+            sorter: true,
+            sortOrder:
+                sortcolumn === "status" && sortorder,
+            filters:bodyshop.md_ro_statuses.statuses.map((s) => {
+                return { text: s, value: [s] };
+            }),
+            onFilter: (value, record) => value.includes(record.status),
+            render: (text, record) => {
+                return record.status || t("general.labels.na");
+            },
+        },
+        {
+            title: t("jobs.fields.vehicle"),
+            dataIndex: "vehicle",
+            key: "vehicle",
+            ellipsis: true,
+            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("vehicles.fields.plate_no"),
+            dataIndex: "plate_no",
+            key: "plate_no",
+            ellipsis: true,
+            responsive: ["md"],
+            sorter: true,
+            sortOrder:
+                sortcolumn === "plate_no" && sortorder,
+        },
+        {
+            title: t("jobs.fields.clm_no"),
+            dataIndex: "clm_no",
+            key: "clm_no",
+            ellipsis: true,
+            responsive: ["md"],
+            sorter: true,
+            sortOrder:
+                sortcolumn === "clm_no" && sortorder,
+            render: (text, record) =>
+                `${record.clm_no || ""}${
+                    record.po_number ? ` (PO: ${record.po_number})` : ""
+                }`,
+        },
+        {
+            title: t("jobs.fields.ins_co_nm"),
+            dataIndex: "ins_co_nm",
+            key: "ins_co_nm",
+            ellipsis: true,
+            // TODO: Restore Filters?
+            // filters:
+            //     (jobs &&
+            //         jobs
+            //             .map((j) => j.ins_co_nm)
+            //             .filter(onlyUnique)
+            //             .map((s) => {
+            //                 return {
+            //                     text: s,
+            //                     value: [s],
+            //                 };
+            //             })) ||
+            //     [],
+            // onFilter: (value, record) => value.includes(record.ins_co_nm),
+            responsive: ["md"],
+        },
+        {
+            title: t("jobs.fields.clm_total"),
+            dataIndex: "clm_total",
+            key: "clm_total",
+            responsive: ["md"],
+            ellipsis: true,
+            sorter: true,
+            sortOrder:
+                sortcolumn === "clm_total" && sortorder,
+            render: (text, record) => (
+                <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
+            ),
+        },
+        {
+            title: t("jobs.labels.estimator"),
+            dataIndex: "jobs.labels.estimator",
+            key: "jobs.labels.estimator",
+            ellipsis: true,
+            responsive: ["xl"],
+            // TODO Restore Filters?
+            // filterSearch: true,
+            // filters:
+            //     (jobs &&
+            //         jobs
+            //             .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
+            //             .filter(onlyUnique)
+            //             .map((s) => {
+            //                 return {
+            //                     text: s || "N/A",
+            //                     value: [s],
+            //                 };
+            //             })) ||
+            //     [],
+            // onFilter: (value, record) =>
+            //     value.includes(
+            //         `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
+            //     ),
+            render: (text, record) =>
+                `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
+        },
+        {
+            title: t("jobs.fields.comment"),
+            dataIndex: "comment",
+            key: "comment",
+            ellipsis: true,
+            responsive: ["md"],
+        },
+        // {
+        //   title: t("jobs.fields.owner_owing"),
+        //   dataIndex: "owner_owing",
+        //   key: "owner_owing",
+        //   responsive: ["md"],
+        //   render: (text, record) => (
+        //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
+        //   ),
+        // },
+    ];
+
+    const scrollMapper = {
+        xs: true,
+        sm: true,
+        md: true,
+        lg: "100%",
+        xl: "100%",
+        xxl: "100%",
+    };
+
+    return (
+        <Card
+            title={t("titles.bc.jobs-active")}
+            extra={
+                <Space wrap>
+                    {search.search && (
+                        <>
+                            <Typography.Title level={4}>
+                                {t("general.labels.searchresults", { search: search.search })}
+                            </Typography.Title>
+                            <Button
+                                onClick={() => {
+                                    delete search.search;
+                                    delete search.page;
+                                    history.push({ search: queryString.stringify(search) });
+                                }}
+                            >
+                                {t("general.actions.clear")}
+                            </Button>
+                        </>
+                    )}
+                    <Button onClick={() => refetch()}>
+                        <SyncOutlined />
+                    </Button>
+                    <Input.Search
+                        placeholder={search.search || t("general.labels.search")}
+                        onSearch={(value) => {
+                            search.search = value;
+                            history.push({ search: queryString.stringify(search) });
+                            searchJobs(value);
+                        }}
+                        loading={loading || searchLoading}
+                        enterButton
+                    />
+                </Space>
+            }
+        >
+            <Table
+                loading={loading || searchLoading }
+                pagination={
+                    search?.search
+                        ? {
+                            pageSize: pageLimit,
+                            showSizeChanger: false,
+
+                        }
+                        : {
+                            pageSize: pageLimit,
+                            current: parseInt(page || 1),
+                            total: total,
+                            showSizeChanger: false,
+                        }
+                }
+                columns={columns}
+                rowKey="id"
+                dataSource={search?.search ? openSearchResults : jobs}
+                scroll={{
+                    x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
+                }}
+                rowSelection={{
+                    onSelect: (record) => {
+                        handleOnRowClick(record);
+                    },
+                    selectedRowKeys: [selected],
+                    type: "radio",
+                }}
+                onChange={handleTableChange}
+                onRow={(record) => {
+                    return {
+                        onClick: () => {
+                            handleOnRowClick(record);
+                        },
+                    };
+                }}
+            />
+        </Card>
+    );
 }
 
-export default connect(mapStateToProps, null)(JobsList);
+export default connect(mapStateToProps, mapDispatchToProps)(JobsList);

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

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
 
@@ -49,7 +49,6 @@ export function JobNotesContainer({ jobId, insertAuditTrail }) {
       insertAuditTrail({
         jobid: jobId,
         operation: AuditTrailMapping.jobnotedeleted(),
-        type: "jobnotedeleted",
       });
     });
     setDeleteLoading(false);

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -16,12 +16,11 @@ import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
-import { pageLimit } from "../../utils/config";
-import { alphaSort, statusSort } from "../../utils/sorters";
-import useLocalStorage from "../../utils/useLocalStorage";
+import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -54,8 +53,10 @@ export function JobsReadyList({ bodyshop }) {
     nextFetchPolicy: "network-only",
   });
 
-  const [state, setState] = useState({ sortedInfo: {} });
-  const [filter, setFilter] = useLocalStorage("filter_jobs_ready", null);
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
 
   const { t } = useTranslation();
   const history = useHistory();
@@ -104,8 +105,7 @@ export function JobsReadyList({ bodyshop }) {
     : [];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, sortedInfo: sorter });
-    setFilter(filters);
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
   const handleOnRowClick = (record) => {
@@ -129,6 +129,7 @@ export function JobsReadyList({ bodyshop }) {
       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.id}
@@ -156,6 +157,7 @@ export function JobsReadyList({ bodyshop }) {
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
+
       responsive: ["md"],
       sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       sortOrder:
@@ -195,15 +197,16 @@ export function JobsReadyList({ bodyshop }) {
         <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
       ),
     },
+
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
       ellipsis: true,
+
       sorter: (a, b) => alphaSort(a.status, b.status),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filteredValue: filter?.status || null,
       filters:
         (jobs &&
           jobs
@@ -214,17 +217,11 @@ export function JobsReadyList({ bodyshop }) {
                 text: s || "No Status*",
                 value: [s],
               };
-            })
-            .sort((a, b) =>
-              statusSort(
-                a.text,
-                b.text,
-                bodyshop.md_ro_statuses.active_statuses
-              )
-            )) ||
+            })) ||
         [],
       onFilter: (value, record) => value.includes(record.status),
     },
+
     {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicle",
@@ -277,7 +274,6 @@ export function JobsReadyList({ bodyshop }) {
       dataIndex: "ins_co_nm",
       key: "ins_co_nm",
       ellipsis: true,
-      filteredValue: filter?.ins_co_nm || null,
       filters:
         (jobs &&
           jobs
@@ -285,11 +281,10 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Ins Co.*",
+                text: s,
                 value: [s],
               };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
+            })) ||
         [],
       onFilter: (value, record) => value.includes(record.ins_co_nm),
       responsive: ["md"],
@@ -300,6 +295,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "clm_total",
       responsive: ["md"],
       ellipsis: true,
+
       sorter: (a, b) => a.clm_total - b.clm_total,
       sortOrder:
         state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
@@ -310,10 +306,9 @@ export function JobsReadyList({ bodyshop }) {
     {
       title: t("jobs.labels.estimator"),
       dataIndex: "jobs.labels.estimator",
-      key: "estimator",
+      key: "jobs.labels.estimator",
       ellipsis: true,
       responsive: ["xl"],
-      filteredValue: filter?.estimator || null,
       filterSearch: true,
       filters:
         (jobs &&
@@ -322,11 +317,10 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Estimator*",
+                text: s || "N/A",
                 value: [s],
               };
-            })
-            .sort((a, b) => alphaSort(a.text, b.text))) ||
+            })) ||
         [],
       onFilter: (value, record) =>
         value.includes(

client/src/components/jobs-related-ros/jobs-related-ros.component.jsx

@@ -2,7 +2,7 @@ import { Space, Tag } from "antd";
 import React from "react";
 import { Link } from "react-router-dom";
 
-export default function JobsRelatedRos({ jobid, job, disabled }) {
+export default function JobsRelatedRos({ jobid, job }) {
   if (!(job && job.vehicle && job.vehicle.jobs)) return null;
   return (
     <Space wrap>
@@ -10,15 +10,9 @@ export default function JobsRelatedRos({ jobid, job, disabled }) {
         .filter((j) => j.id !== job.id)
         .map((j) => (
           <Tag key={j.id}>
-            {disabled ? (
-              <>{`${j.ro_number || "N/A"}${j.clm_no ? ` | ${j.clm_no}` : ""}${
-                j.status ? ` | ${j.status}` : ""
-              }`}</>
-            ) : (
-              <Link to={`/manage/jobs/${j?.id}`}>{`${j.ro_number || "N/A"}${
-                j.clm_no ? ` | ${j.clm_no}` : ""
-              }${j.status ? ` | ${j.status}` : ""}`}</Link>
-            )}
+            <Link to={`/manage/jobs/${j?.id}`}>{`${j.ro_number || "N/A"}${
+              j.clm_no ? ` | ${j.clm_no}` : ""
+            }${j.status ? ` | ${j.status}` : ""}`}</Link>
           </Tag>
         ))}
     </Space>

client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export default connect(
   mapStateToProps,
@@ -76,7 +76,6 @@ export function LaborAllocationsAdjustmentEdit({
             values.hours -
             ((adjustments && adjustments[mod_lbr_ty]) || 0).toFixed(1),
         }),
-        type: "jobmodifylbradj",
       });
     }
     setLoading(false);

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

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function NoteUpsertModalContainer({
@@ -70,7 +70,6 @@ export function NoteUpsertModalContainer({
         insertAuditTrail({
           jobid: context.jobId,
           operation: AuditTrailMapping.jobnoteupdated(),
-          type: "jobnoteupdated",
         });
       });
       if (refetch) refetch();
@@ -103,7 +102,6 @@ export function NoteUpsertModalContainer({
           insertAuditTrail({
             jobid: newJobId,
             operation: AuditTrailMapping.jobnoteadded(),
-            type: "jobnoteadded",
           });
         });
       }
@@ -117,7 +115,6 @@ export function NoteUpsertModalContainer({
       insertAuditTrail({
         jobid: context.jobId,
         operation: AuditTrailMapping.jobnoteadded(),
-        type: "jobnoteadded",
       });
     }
   };

client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx

@@ -24,7 +24,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
-
+  
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -44,15 +44,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicleid",
       key: "vehicleid",
-      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 === "vehicleid" && state.sortedInfo.order,
       render: (text, record) =>
         record.vehicleid ? (
           <Link to={`/manage/vehicles/${record.vehicleid}`}>
@@ -76,15 +67,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) =>
-        statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
-        text: status,
-        value: status,
-      })),
-      onFilter: (value, record) => value.includes(record.status),
     },
 
     {

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -1,16 +1,12 @@
-import { useApolloClient, useMutation, useQuery } from "@apollo/client";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import { useMutation, useQuery, useApolloClient } from "@apollo/client";
 import { Form, Modal, notification } from "antd";
-import axios from "axios";
-import _ from "lodash";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { logImEXEvent, auth } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import {
   INSERT_NEW_PARTS_ORDERS,
   QUERY_PARTS_ORDER_OEC,
@@ -33,6 +29,10 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
+import axios from "axios";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import _ from "lodash";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -45,8 +45,8 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
   setBillEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "billEnter" })),
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function PartsOrderModalContainer({
@@ -142,7 +142,6 @@ export function PartsOrderModalContainer({
         : AuditTrailMapping.jobspartsorder(
             insertResult.data.insert_parts_orders.returning[0].order_number
           ),
-      type: isReturn ? "jobspartsreturn" : "jobspartsorder",
     });
 
     const jobLinesResult = await updateJobLines({

client/src/components/parts-queue-card/parts-queue-card.component.jsx

@@ -1,77 +0,0 @@
-import { useQuery } from "@apollo/client";
-import { Card, Divider, Drawer, Grid } from "antd";
-import queryString from "query-string";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { Link, useHistory, useLocation } from "react-router-dom";
-import { QUERY_PARTS_QUEUE_CARD_DETAILS } from "../../graphql/jobs.queries";
-import AlertComponent from "../alert/alert.component";
-import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import PartsQueueJobLinesComponent from "./parts-queue-job-lines.component";
-
-export default function PartsQueueDetailCard() {
-  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
-    .filter((screen) => !!screen[1])
-    .slice(-1)[0];
-
-  const bpoints = {
-    xs: "100%",
-    sm: "100%",
-    md: "100%",
-    lg: "75%",
-    xl: "75%",
-    xxl: "60%",
-  };
-  const drawerPercentage = selectedBreakpoint
-    ? bpoints[selectedBreakpoint[0]]
-    : "100%";
-
-  const searchParams = queryString.parse(useLocation().search);
-  const { selected } = searchParams;
-  const history = useHistory();
-  const { loading, error, data } = useQuery(QUERY_PARTS_QUEUE_CARD_DETAILS, {
-    variables: { id: selected },
-    skip: !selected,
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
-
-  const { t } = useTranslation();
-  const handleDrawerClose = () => {
-    delete searchParams.selected;
-    history.push({
-      search: queryString.stringify({
-        ...searchParams,
-      }),
-    });
-  };
-
-  return (
-    <Drawer
-      visible={!!selected}
-      destroyOnClose
-      width={drawerPercentage}
-      placement="right"
-      onClose={handleDrawerClose}
-    >
-      {loading ? <LoadingSpinner /> : null}
-      {error ? <AlertComponent message={error.message} type="error" /> : null}
-      {data ? (
-        <Card
-          title={
-            <Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>
-              {data.jobs_by_pk.ro_number || t("general.labels.na")}
-            </Link>
-          }
-        >
-          <JobsDetailHeader job={data ? data.jobs_by_pk : null} />
-          <Divider type="horizontal" />
-          <PartsQueueJobLinesComponent
-            jobLines={data.jobs_by_pk ? data.jobs_by_pk.joblines : null}
-          />
-        </Card>
-      ) : null}
-    </Drawer>
-  );
-}

client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx

@@ -1,208 +0,0 @@
-import { Card, Table } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { onlyUnique } from "../../utils/arrayHelper";
-import { alphaSort } from "../../utils/sorters";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
-});
-
-const mapDispatchToProps = (dispatch) => ({});
-
-export function PartsQueueJobLinesComponent({ jobRO, loading, jobLines }) {
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: {},
-  });
-  const { t } = useTranslation();
-
-  const columns = [
-    {
-      title: "#",
-      dataIndex: "line_no",
-      key: "line_no",
-      sorter: (a, b) => a.line_no - b.line_no,
-      sortOrder:
-        state.sortedInfo.columnKey === "line_no" && state.sortedInfo.order,
-    },
-    {
-      title: t("joblines.fields.line_desc"),
-      dataIndex: "line_desc",
-      key: "line_desc",
-      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
-      onCell: (record) => ({
-        className: record.manual_line && "job-line-manual",
-        style: {
-          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
-        },
-      }),
-      sortOrder:
-        state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
-      ellipsis: true,
-    },
-    {
-      title: t("joblines.fields.oem_partno"),
-      dataIndex: "oem_partno",
-      key: "oem_partno",
-      sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
-      sortOrder:
-        state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
-      ellipsis: true,
-      render: (text, record) =>
-        `${record.oem_partno || ""} ${
-          record.alt_partno ? `(${record.alt_partno})` : ""
-        }`.trim(),
-    },
-    {
-      title: t("joblines.fields.part_type"),
-      dataIndex: "part_type",
-      key: "part_type",
-      filteredValue: state.filteredInfo.part_type || null,
-      sorter: (a, b) => alphaSort(a.part_type, b.part_type),
-      sortOrder:
-        state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order,
-      filters: [
-        {
-          text: t("jobs.labels.partsfilter"),
-          value: [
-            "PAN",
-            "PAC",
-            "PAR",
-            "PAL",
-            "PAA",
-            "PAM",
-            "PAP",
-            "PAS",
-            "PASL",
-            "PAG",
-          ],
-        },
-        {
-          text: t("joblines.fields.part_types.PAN"),
-          value: ["PAN"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAP"),
-          value: ["PAP"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAL"),
-          value: ["PAL"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAA"),
-          value: ["PAA"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAG"),
-          value: ["PAG"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAS"),
-          value: ["PAS"],
-        },
-        {
-          text: t("joblines.fields.part_types.PASL"),
-          value: ["PASL"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAC"),
-          value: ["PAC"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAR"),
-          value: ["PAR"],
-        },
-        {
-          text: t("joblines.fields.part_types.PAM"),
-          value: ["PAM"],
-        },
-      ],
-      onFilter: (value, record) => value.includes(record.part_type),
-      render: (text, record) =>
-        record.part_type
-          ? t(`joblines.fields.part_types.${record.part_type}`)
-          : null,
-    },
-    {
-      title: t("joblines.fields.part_qty"),
-      dataIndex: "part_qty",
-      key: "part_qty",
-    },
-    {
-      title: t("joblines.fields.act_price"),
-      dataIndex: "act_price",
-      key: "act_price",
-      sorter: (a, b) => a.act_price - b.act_price,
-      sortOrder:
-        state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
-      ellipsis: true,
-      render: (text, record) => (
-        <CurrencyFormatter>
-          {record.db_ref === "900510" || record.db_ref === "900511"
-            ? record.prt_dsmk_m
-            : record.act_price}
-        </CurrencyFormatter>
-      ),
-    },
-    {
-      title: t("joblines.fields.location"),
-      dataIndex: "location",
-      key: "location",
-    },
-    {
-      title: t("joblines.fields.status"),
-      dataIndex: "status",
-      key: "status",
-      sorter: (a, b) => alphaSort(a.status, b.status),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filteredValue: state.filteredInfo.status || null,
-      filters:
-        (jobLines &&
-          jobLines
-            .map((l) => l.status)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Status*",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.status),
-    },
-  ];
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState((state) => ({
-      ...state,
-      filteredInfo: filters,
-      sortedInfo: sorter,
-    }));
-  };
-
-  return (
-    <Card title={t("jobs.labels.parts_lines")}>
-      <Table
-        columns={columns}
-        rowKey="id"
-        loading={loading}
-        pagination={false}
-        dataSource={jobLines}
-        onChange={handleTableChange}
-      />
-    </Card>
-  );
-}
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(PartsQueueJobLinesComponent);

client/src/components/payment-expanded-row/payment-expanded-row.component.jsx

@@ -59,8 +59,8 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
     await insertPayment({
       variables: {
         paymentInput: {
-          amount: -refund_response?.data?.amount,
-          transactionid: payment_response?.response?.receiptelements?.transid,
+          amount: -refund_response.data.amount,
+          transactionid: payment_response.response.receiptelements.transid,
           payer: record.payer,
           type: "Refund",
           jobid: payment_response.jobid,

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

@@ -1,12 +1,6 @@
 import { Button, Form, Input, PageHeader, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  selectAuthLevel,
-  selectBodyshop,
-} from "../../redux/user/user.selectors";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {
@@ -14,6 +8,12 @@ import PhoneFormItem, {
 } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   authLevel: selectAuthLevel,
   bodyshop: selectBodyshop,
@@ -46,19 +46,13 @@ export function PhonebookFormComponent({
   return (
     <div>
       <PageHeader
-        title={
-          <Form.Item shouldUpdate>
-            {() =>
-              `${form.getFieldValue("firstname") || ""} ${
-                form.getFieldValue("lastname") || ""
-              }${
-                form.getFieldValue("company")
-                  ? ` - ${form.getFieldValue("company")}`
-                  : ""
-              }`
-            }
-          </Form.Item>
-        }
+        title={`${form.getFieldValue("firstname") || ""} ${
+          form.getFieldValue("lastname") || ""
+        }${
+          form.getFieldValue("company")
+            ? ` - ${form.getFieldValue("company")}`
+            : ""
+        }`}
         extra={
           <Space>
             <Button

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -29,8 +29,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function ProductionBoardKanbanComponent({
@@ -115,7 +115,7 @@ export function ProductionBoardKanbanComponent({
       // console.log("==> New Card is somewhere in the middle");
       movedCardNewKanbanParent = newChildCard.kanbanparent;
     } else {
-      console.log("==> !!!!!!Couldn't find a parent.!!!! <==");
+      throw new Error("==> !!!!!!Couldn't find a parent.!!!! <==");
     }
     const newChildCardNewParent = newChildCard ? card.id : null;
     const update = await client.mutate({
@@ -133,7 +133,6 @@ export function ProductionBoardKanbanComponent({
     insertAuditTrail({
       jobid: card.id,
       operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
-      type: "jobstatuschange",
     });
 
     if (update.errors) {
@@ -154,7 +153,7 @@ export function ProductionBoardKanbanComponent({
       0
     )
     .toFixed(1);
-  const totalLAB = data
+    const totalLAB = data
     .reduce(
       (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
       0

client/src/components/production-list-columns/production-list-columns.add.component.jsx

@@ -1,7 +1,7 @@
-import { Button, Dropdown, Menu } from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
+import { Button, Dropdown, Menu } from "antd";
 import dataSource from "./production-list-columns.data";
+import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,7 +24,6 @@ export function ProductionColumnsComponent({
   columnState,
   technician,
   bodyshop,
-  data,
   tableState,
 }) {
   const [columns, setColumns] = columnState;
@@ -37,7 +36,6 @@ export function ProductionColumnsComponent({
         bodyshop,
         technician,
         state: tableState,
-        data: data,
         activeStatuses: bodyshop.md_ro_statuses.active_statuses,
       }).filter((i) => i.key === e.key),
     ]);
@@ -48,7 +46,6 @@ export function ProductionColumnsComponent({
     technician,
     state: tableState,
     activeStatuses: bodyshop.md_ro_statuses.active_statuses,
-    data: data,
   });
   const menu = (
     <Menu

client/src/components/production-list-columns/production-list-columns.alert.component.jsx

@@ -1,23 +1,12 @@
 import { ExclamationCircleFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
 import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
+import { useMutation } from "@apollo/client";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
-});
-
-export function ProductionListColumnAlert({ record, insertAuditTrail }) {
+export default function ProductionListColumnAlert({ record }) {
   const { t } = useTranslation();
 
   const [updateAlert] = useMutation(UPDATE_JOB);
@@ -38,15 +27,6 @@ export function ProductionListColumnAlert({ record, insertAuditTrail }) {
           },
         },
       },
-    });
-    insertAuditTrail({
-      jobid: record.id,
-      operation: AuditTrailMapping.alertToggle(
-        !!record.production_vars && !!record.production_vars.alert
-          ? !record.production_vars.alert
-          : true
-      ),
-      type: "alertToggle",
     }).then(() => {
       if (record.refetch) record.refetch();
     });
@@ -78,8 +58,3 @@ export function ProductionListColumnAlert({ record, insertAuditTrail }) {
     </Dropdown>
   );
 }
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ProductionListColumnAlert);

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,17 +1,15 @@
-import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
-import { Checkbox, Space, Tooltip } from "antd";
+import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
+import { Space, Tooltip } from "antd";
 import i18n from "i18next";
+import moment from "moment";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import ProductionListColumnAlert from "./production-list-columns.alert.component";
 import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
@@ -27,7 +25,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 
-const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
+const r = ({ technician, state, activeStatuses, bodyshop }) => {
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -77,16 +75,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       dataIndex: "ownr",
       key: "ownr",
       ellipsis: true,
-      render: (text, record) =>
-        technician ? (
-          <OwnerNameDisplay ownerObject={record} />
-        ) : (
-          <Link to={`/manage/owners/${record.ownerid}`}>
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ),
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+      render: (text, record) => <OwnerNameDisplay ownerObject={record} />,
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       sortOrder:
         state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
     },
@@ -97,25 +87,18 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       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 || ""}`
+          a.v_make_desc + a.v_model_desc,
+          b.v_make_desc + b.v_model_desc
         ),
       sortOrder:
         state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
-      render: (text, record) =>
-        technician ? (
-          <>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          } ${record.v_color || ""} ${record.plate_no || ""}`}</>
-        ) : (
-          <Link to={`/manage/vehicles/${record.vehicleid}`}>{`${
-            record.v_model_yr || ""
-          } ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${
-            record.v_color || ""
-          } ${record.plate_no || ""}`}</Link>
-        ),
+      render: (text, record) => (
+        <Link to={`/manage/vehicles/${record.vehicleid}`}>{`${
+          record.v_model_yr || ""
+        } ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${
+          record.v_color || ""
+        } ${record.plate_no || ""}`}</Link>
+      ),
     },
     {
       title: i18n.t("jobs.fields.actual_in"),
@@ -189,12 +172,17 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         state.sortedInfo.columnKey === "date_next_contact" &&
         state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate
-          record={record}
-          field="date_next_contact"
-          pastIndicator
-          time
-        />
+        <span
+          style={{
+            color:
+              record.date_next_contact &&
+              moment(record.date_next_contact).isBefore(moment())
+                ? "red"
+                : "",
+          }}
+        >
+          <ProductionListDate record={record} field="date_next_contact" time />
+        </span>
       ),
     },
     {
@@ -290,20 +278,6 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       dataIndex: "special_coverage_policy",
       key: "special_coverage_policy",
       ellipsis: true,
-      sorter: (a, b) =>
-        Number(a.special_coverage_policy) - Number(b.special_coverage_policy),
-      sortOrder:
-        state.sortedInfo.columnKey === "special_coverage_policy" &&
-        state.sortedInfo.order,
-      filters: [
-        { text: "True", value: true },
-        { text: "False", value: false },
-      ],
-      onFilter: (value, record) =>
-        value.includes(record.special_coverage_policy),
-      render: (text, record) => (
-        <Checkbox checked={record.special_coverage_policy} />
-      ),
     },
 
     {
@@ -315,16 +289,6 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       sortOrder:
         state.sortedInfo.columnKey === "alt_transport" &&
         state.sortedInfo.order,
-      filters:
-        (bodyshop &&
-          bodyshop.appt_alt_transport.map((s) => {
-            return {
-              text: s,
-              value: [s],
-            };
-          })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.alt_transport),
       render: (text, record) => (
         <div>
           {record.alt_transport}
@@ -405,11 +369,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       title: i18n.t("production.labels.alert"),
       dataIndex: "alert",
       key: "alert",
-      sorter: (a, b) =>
-        Number(a.production_vars?.alert || false) -
-        Number(b.production_vars?.alert || false),
-      sortOrder:
-        state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
+
       render: (text, record) => <ProductionListColumnAlert record={record} />,
     },
     {
@@ -576,36 +536,6 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         <JobPartsQueueCount parts={record.joblines_status} record={record} />
       ),
     },
-    {
-      title: i18n.t("jobs.labels.estimator"),
-      dataIndex: "estimator",
-      key: "estimator",
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
-          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
-      filters:
-        (data &&
-          data
-            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "N/A",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) =>
-        value.includes(
-          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
-        ),
-      render: (text, record) =>
-        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
-    },
 
     //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
     // {

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -3,12 +3,12 @@ import { useMutation } from "@apollo/client";
 import {
   Button,
   Col,
+  notification,
   Popover,
   Row,
   Select,
   Space,
   Spin,
-  notification,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -25,8 +25,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function ProductionListEmpAssignment({
@@ -55,7 +55,6 @@ export function ProductionListEmpAssignment({
     insertAuditTrail({
       jobid: record.id,
       operation: AuditTrailMapping.jobassignmentchange(empAssignment, name),
-      type: "jobassignmentchange",
     });
 
     if (!!result.errors) {
@@ -81,7 +80,6 @@ export function ProductionListEmpAssignment({
     insertAuditTrail({
       jobid: record.id,
       operation: AuditTrailMapping.jobassignmentremoved(empAssignment),
-      type: "jobassignmentremoved",
     });
 
     if (!!result.errors) {

client/src/components/production-list-columns/production-list-columns.status.category.jsx

@@ -12,8 +12,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export function ProductionListColumnCategory({ record, bodyshop }) {
   const [updateJob] = useMutation(UPDATE_JOB);

client/src/components/production-list-columns/production-list-columns.status.component.jsx

@@ -5,16 +5,16 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export function ProductionListColumnStatus({
   record,
@@ -40,7 +40,6 @@ export function ProductionListColumnStatus({
     insertAuditTrail({
       jobid: record.id,
       operation: AuditTrailMapping.jobstatuschange(key),
-      type: "jobstatuschange",
     });
 
     setLoading(false);

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -13,14 +13,12 @@ import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import JobAtChange from "../job-at-change/job-at-change.component";
 import JobDetailCardsDocumentsComponent from "../job-detail-cards/job-detail-cards.documents.component";
 import JobDetailCardsNotesComponent from "../job-detail-cards/job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "../job-detail-cards/job-detail-cards.parts.component";
-import CardTemplate from "../job-detail-cards/job-detail-cards.template.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
@@ -105,13 +103,7 @@ export function ProductionListDetail({
       {error && <AlertComponent error={JSON.stringify(error)} />}
       {!loading && data && (
         <div>
-          <CardTemplate
-            title={t("jobs.labels.employeeassignments")}
-            loading={loading}
-          >
-            <JobEmployeeAssignments job={data.jobs_by_pk} refetch={refetch} />
-          </CardTemplate>
-          <div style={{ height: "8px" }} />
+          <JobEmployeeAssignments job={data.jobs_by_pk} refetch={refetch} />
           <Descriptions bordered column={1}>
             <Descriptions.Item label={t("jobs.fields.ro_number")}>
               {theJob.ro_number || ""}
@@ -119,7 +111,7 @@ export function ProductionListDetail({
             <Descriptions.Item label={t("jobs.fields.alt_transport")}>
               <Space>
                 {data.jobs_by_pk.alt_transport || ""}
-                <JobAtChange job={data.jobs_by_pk} />
+                <JobAtChange event={{ job: data.jobs_by_pk }} />
               </Space>
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.clm_no")}>
@@ -129,30 +121,15 @@ export function ProductionListDetail({
               {theJob.ins_co_nm || ""}
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.owner")}>
-              <Space>
-                <OwnerNameDisplay ownerObject={theJob} />
-                {!technician ? (
-                  <>
-                    <StartChatButton
-                      phone={data.jobs_by_pk.ownr_ph1}
-                      jobid={data.jobs_by_pk.id}
-                    />
-                    <StartChatButton
-                      phone={data.jobs_by_pk.ownr_ph2}
-                      jobid={data.jobs_by_pk.id}
-                    />
-                  </>
-                ) : (
-                  <>
-                    <PhoneNumberFormatter>
-                      {data.jobs_by_pk.ownr_ph1}
-                    </PhoneNumberFormatter>
-                    <PhoneNumberFormatter>
-                      {data.jobs_by_pk.ownr_ph2}
-                    </PhoneNumberFormatter>
-                  </>
-                )}
-              </Space>
+              <OwnerNameDisplay ownerObject={theJob} />
+              <StartChatButton
+                phone={data.jobs_by_pk.ownr_ph1}
+                jobid={data.jobs_by_pk.id}
+              />
+              <StartChatButton
+                phone={data.jobs_by_pk.ownr_ph2}
+                jobid={data.jobs_by_pk.id}
+              />
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.vehicle")}>
               {`${theJob.v_model_yr || ""} ${theJob.v_color || ""} ${
@@ -169,24 +146,21 @@ export function ProductionListDetail({
               <DateFormatter>{theJob.scheduled_completion}</DateFormatter>
             </Descriptions.Item>
           </Descriptions>
-          <div style={{ height: "8px" }} />
+
           <JobDetailCardsPartsComponent
             loading={loading}
             data={data ? data.jobs_by_pk : null}
           />
-          <div style={{ height: "8px" }} />
+
           <JobDetailCardsNotesComponent
             loading={loading}
             data={data ? data.jobs_by_pk : null}
           />
           {!bodyshop.uselocalmediaserver && (
-            <>
-              <div style={{ height: "8px" }} />
-              <JobDetailCardsDocumentsComponent
-                loading={loading}
-                data={data ? data.jobs_by_pk : null}
-              />
-            </>
+            <JobDetailCardsDocumentsComponent
+              loading={loading}
+              data={data ? data.jobs_by_pk : null}
+            />
           )}
         </div>
       )}

client/src/components/production-list-table/production-list-table-view-select.component.jsx

@@ -24,7 +24,6 @@ export function ProductionListTable({
   technician,
   currentUser,
   state,
-  data,
   setColumns,
   setState,
 }) {
@@ -42,7 +41,6 @@ export function ProductionListTable({
               bodyshop,
               technician,
               state,
-              data: data,
               activeStatuses: bodyshop.md_ro_statuses.active_statuses,
             }).find((e) => e.key === k.key),
             width: k.width,
@@ -97,7 +95,6 @@ export function ProductionListTable({
           ...ProductionListColumns({
             technician,
             state,
-            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width,

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

@@ -10,7 +10,7 @@ import {
   Statistic,
   Table,
 } from "antd";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useMemo, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -79,7 +79,6 @@ export function ProductionListTable({
             bodyshop,
             technician,
             state,
-            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width ?? 100,
@@ -88,33 +87,6 @@ export function ProductionListTable({
       []
   );
 
-  useEffect(() => {
-    const newColumns =
-      (state &&
-        matchingColumnConfig &&
-        matchingColumnConfig.columns.columnKeys.map((k) => {
-          return {
-            ...ProductionListColumns({
-              bodyshop,
-              technician,
-              state,
-              data: data,
-              activeStatuses: bodyshop.md_ro_statuses.active_statuses,
-            }).find((e) => e.key === k.key),
-            width: k.width ?? 100,
-          };
-        })) ||
-      [];
-    setColumns(newColumns);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    //state,
-    matchingColumnConfig,
-    bodyshop,
-    technician,
-    data,
-  ]); //State removed from dependency array as it causes race condition when removing columns from table view and is not needed.
-
   const handleTableChange = (pagination, filters, sorter) => {
     setState({
       ...state,
@@ -132,8 +104,7 @@ export function ProductionListTable({
 
   const removeColumn = (e) => {
     const { key } = e;
-    const newColumns = columns.filter((i) => i.key !== key);
-    setColumns(newColumns);
+    setColumns(columns.filter((i) => i.key !== key));
   };
 
   const handleResize =
@@ -256,7 +227,6 @@ export function ProductionListTable({
             <ProductionListColumnsAdd
               columnState={[columns, setColumns]}
               tableState={state}
-              data={data}
             />
             <ProductionListSaveConfigButton
               columns={columns}
@@ -267,7 +237,6 @@ export function ProductionListTable({
               state={state}
               setState={setState}
               setColumns={setColumns}
-              data={data}
             />
 
             <Input

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -55,11 +55,10 @@ const ret = {
   "shiftclock:view": 2,
 
   "shop:config": 4,
-  "shop:dashboard": 3,
   "shop:rbac": 5,
-  "shop:reportcenter": 2,
-  "shop:templates": 4,
   "shop:vendors": 2,
+  "shop:dashboard": 3,
+  "shop:templates": 4,
 
   "temporarydocs:view": 2,
 

client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx

@@ -1,432 +0,0 @@
-import {Button, Card, Checkbox, Col, Form, Input, InputNumber, Row, Select} from "antd";
-import React, {useCallback, useEffect, useMemo, useState} from "react";
-import {fetchFilterData} from "../../utils/RenderTemplate";
-import {DeleteFilled} from "@ant-design/icons";
-import {useTranslation} from "react-i18next";
-import {getOrderOperatorsByType, getWhereOperatorsByType} from "../../utils/graphQLmodifier";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import {generateInternalReflections} from "./report-center-modal-utils";
-import {FormDatePicker} from "../form-date-picker/form-date-picker.component.jsx";
-
-export default function ReportCenterModalFiltersSortersComponent({form, bodyshop}) {
-    return (
-        <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
-            {() => {
-                const key = form.getFieldValue("key");
-                return <RenderFilters form={form} templateId={key} bodyshop={bodyshop}/>;
-            }}
-        </Form.Item>
-    );
-}
-
-/**
- * Filters Section
- * @param filters
- * @param form
- * @param bodyshop
- * @returns {JSX.Element}
- * @constructor
- */
-function FiltersSection({filters, form, bodyshop}) {
-    const {t} = useTranslation();
-
-    return (
-        <Card type='inner' title={t('reportcenter.labels.advanced_filters_filters')} style={{marginTop: '10px'}}>
-            <Form.List name={["filters"]}>
-                {(fields, {add, remove}) => {
-                    return (
-                        <div>
-                            {fields.map((field, index) => (
-                                <Form.Item key={field.key}>
-                                    <Row gutter={[16, 16]}>
-                                        <Col span={10}>
-                                            <Form.Item
-                                                key={`${index}field`}
-                                                label={t('reportcenter.labels.advanced_filters_filter_field')}
-                                                name={[field.name, "field"]}
-                                                rules={[
-                                                    {
-                                                        required: true,
-                                                        //message: t("general.validation.required"),
-                                                    },
-                                                ]}
-                                            >
-                                                <Select
-                                                    getPopupContainer={trigger => trigger.parentNode}
-                                                    onChange={() => {
-                                                        // Clear related Fields
-                                                        form.setFieldValue(['filters', field.name, 'value'], null);
-                                                        form.setFieldValue(['filters', field.name, 'operator'], null);
-                                                    }}
-                                                    options={
-                                                        filters.map((f) => {
-                                                            return {
-                                                                value: f.name,
-                                                                label: f?.translation ? (t(f.translation) === f.translation ? f.label : t(f.translation)) : f.label,
-                                                            }
-                                                        })
-                                                    }
-                                                />
-                                            </Form.Item>
-                                        </Col>
-                                        <Col span={6}>
-                                            <Form.Item
-                                                dependencies={[['filters', field.name, "field"],['filters', field.name, "value"]]}
-                                            >
-                                                {
-                                                    () => {
-                                                        const name = form.getFieldValue(['filters', field.name, "field"]);
-                                                        const type = filters.find(f => f.name === name)?.type;
-
-                                                        return <Form.Item
-                                                            key={`${index}operator`}
-                                                            label={t('reportcenter.labels.advanced_filters_filter_operator')}
-                                                            name={[field.name, "operator"]}
-                                                            rules={[
-                                                                {
-                                                                    required: true,
-                                                                    //message: t("general.validation.required"),
-                                                                },
-                                                            ]}
-                                                        >
-                                                            <Select
-                                                                getPopupContainer={trigger => trigger.parentNode}
-                                                                options={   getWhereOperatorsByType(type)}
-                                                                onChange={() => {
-                                                                    // Clear related Fields
-
-                                                                    form.setFieldValue(['filters', field.name, 'value'], undefined);
-                                                                }}
-                                                            />
-                                                        </Form.Item>
-                                                    }
-                                                }
-                                            </Form.Item>
-                                        </Col>
-                                        <Col span={6}>
-                                            <Form.Item dependencies={[
-                                                ['filters', field.name, "field"],
-                                                ['filters', field.name, "operator"]
-                                            ]}
-                                            >
-                                                {
-                                                    () => {
-                                                        // Because it looks cleaner than inlining.
-                                                        const name = form.getFieldValue(['filters', field.name, "field"]);
-                                                        const type = filters.find(f => f.name === name)?.type;
-                                                        const reflector = filters.find(f => f.name === name)?.reflector;
-                                                        const operator = form.getFieldValue(['filters', field.name, "operator"]);
-                                                        const operatorType = operator ? getWhereOperatorsByType(type).find((o) => o.value === operator)?.type : null;
-
-                                                        return <Form.Item
-                                                            key={`${index}value`}
-                                                            label={t('reportcenter.labels.advanced_filters_filter_value')}
-                                                            name={[field.name, "value"]}
-                                                            rules={[
-                                                                {
-                                                                    required: true,
-                                                                    //message: t("general.validation.required"),
-                                                                },
-                                                            ]}
-                                                        >
-                                                            {
-                                                                (() => {
-                                                                    const generateReflections = (reflector) => {
-                                                                        if (!reflector) return [];
-
-                                                                        const {name} = reflector;
-                                                                        const path = name?.split('.');
-                                                                        const upperPath = path?.[0];
-                                                                        const finalPath = path?.slice(1).join('.');
-
-                                                                        return generateInternalReflections({
-                                                                            bodyshop,
-                                                                            upperPath,
-                                                                            finalPath,
-                                                                            t
-                                                                        });
-                                                                    };
-
-                                                                    const reflections = reflector ? generateReflections(reflector) : [];
-                                                                    const fieldPath = [[field.name, "value"]];
-                                                                    // We have reflections so we will use a select box
-                                                                    if (reflections.length > 0) {
-                                                                        // We have reflections and the operator type is array, so we will use a select box with multiple options
-                                                                        if (operatorType === "array") {
-                                                                            return (
-                                                                                <Select
-                                                                                    disabled={!operator}
-                                                                                    mode="multiple"
-                                                                                    options={reflections}
-                                                                                    getPopupContainer={trigger => trigger.parentNode}
-                                                                                    onChange={(value) => {
-                                                                                        form.setFieldValue(fieldPath, value);
-                                                                                    }}
-                                                                                />
-                                                                            );
-                                                                        }
-                                                                        return (
-                                                                            <Select
-                                                                                options={reflections}
-                                                                                getPopupContainer={trigger => trigger.parentNode}
-                                                                                onChange={(value) => {
-                                                                                    form.setFieldValue(fieldPath, value);
-                                                                                }}
-                                                                            />
-                                                                        );
-                                                                    }
-
-                                                                    // We have a type of number, so we will use a number input
-                                                                    if (type === "number") {
-                                                                        return (
-                                                                            <InputNumber
-                                                                                disabled={!operator}
-                                                                                onChange={(value) => form.setFieldValue(fieldPath, value)}/>
-                                                                        );
-                                                                    }
-
-                                                                    // We have a type of date, so we will use a date picker
-                                                                    if (type === "date") {
-                                                                        return (
-                                                                            <FormDatePicker
-                                                                                disabled={!operator}
-                                                                                onChange={(date) => form.setFieldValue(fieldPath, date)}
-                                                                            />
-                                                                        );
-                                                                    }
-
-                                                                    // we have a type of boolean, so we will use a select box with a true or false option.
-                                                                    if (type === "boolean" || type === "bool") {
-                                                                        return (
-                                                                            <Select
-                                                                                disabled={!operator}
-                                                                                getPopupContainer={trigger => trigger.parentNode}
-                                                                                options={[
-                                                                                    {
-                                                                                        label: t('reportcenter.labels.advanced_filters_true'),
-                                                                                        value: true
-                                                                                    },
-                                                                                    {
-                                                                                        label: t('reportcenter.labels.advanced_filters_false'),
-                                                                                        value: false
-                                                                                    }
-                                                                                ]}
-                                                                                onChange={(value) => form.setFieldValue(fieldPath, value)}
-                                                                            />
-                                                                        );
-                                                                    }
-                                                                    return (
-                                                                        <Input
-                                                                            disabled={!operator}
-                                                                            onChange={(e) => form.setFieldValue(fieldPath, e.target.value)}
-                                                                        />
-                                                                    );
-                                                                })()
-                                                            }
-                                                        </Form.Item>
-                                                    }
-                                                }
-                                            </Form.Item>
-
-                                        </Col>
-                                        <Col span={2}>
-                                            <DeleteFilled
-                                                style={{margin: "1rem", paddingTop: '23px'}}
-                                                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>
-        </Card>
-    );
-}
-
-/**
- * Sorters Section
- * @param sorters
- * @param form
- * @returns {JSX.Element}
- * @constructor
- */
-function SortersSection({sorters}) {
-    const {t} = useTranslation();
-    return (
-        <Card type='inner' title={t('reportcenter.labels.advanced_filters_sorters')} style={{marginTop: '10px'}}>
-            <Form.List name={["sorters"]}>
-                {(fields, {add, remove}) => {
-                    return (
-                        <div>
-                            Sorters
-                            {fields.map((field, index) => (
-                                <Form.Item key={field.key}>
-                                    <Row gutter={[16, 16]}>
-                                        <Col span={11}>
-                                            <Form.Item
-                                                key={`${index}field`}
-                                                label={t('reportcenter.labels.advanced_filters_sorter_field')}
-                                                name={[field.name, "field"]}
-                                                rules={[
-                                                    {
-                                                        required: true,
-                                                        //message: t("general.validation.required"),
-                                                    },
-                                                ]}
-                                            >
-                                                <Select
-                                                    options={
-                                                        sorters.map((f) => ({
-                                                            value: f.name,
-                                                            label: f?.translation ? (t(f.translation) === f.translation ? f.label : t(f.translation)) : f.label,
-                                                        }))
-                                                    }
-                                                    getPopupContainer={trigger => trigger.parentNode}
-                                                />
-                                            </Form.Item>
-                                        </Col>
-                                        <Col span={11}>
-                                            <Form.Item
-                                                key={`${index}direction`}
-                                                label={t('reportcenter.labels.advanced_filters_sorter_direction')}
-                                                name={[field.name, "direction"]}
-                                                rules={[
-                                                    {
-                                                        required: true,
-                                                        //message: t("general.validation.required"),
-                                                    },
-                                                ]}
-                                            >
-                                                <Select
-                                                    options={getOrderOperatorsByType()}
-                                                    getPopupContainer={trigger => trigger.parentNode}
-                                                />
-                                            </Form.Item>
-                                        </Col>
-
-                                        <Col span={2}>
-                                            <DeleteFilled
-                                                style={{margin: "1rem", paddingTop: '23px'}}
-                                                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>
-        </Card>
-    );
-}
-
-/**
- * Render Filters
- * @param templateId
- * @param form
- * @param bodyshop
- * @returns {JSX.Element|null}
- * @constructor
- */
-function RenderFilters({templateId, form, bodyshop}) {
-    const [state, setState] = useState(null);
-    const [visible, setVisible] = useState(false);
-    const [isLoading, setIsLoading] = useState(false);
-    const {t} = useTranslation();
-
-    const fetch = useCallback(async () => {
-        // Reset all the filters and Sorters.
-        form.resetFields(['filters']);
-        form.resetFields(['sorters']);
-        form.resetFields(['defaultSorters']);
-
-        setIsLoading(true);
-
-        const data = await fetchFilterData({name: templateId});
-
-        // We have Success
-        if (data?.success) {
-            if (data?.data?.sorters && data?.data?.sorters.length > 0) {
-                const defaultSorters = data?.data?.sorters.filter((sorter) => sorter.hasOwnProperty('default')).map((sorter) => {
-                    return {
-                        field: sorter.name,
-                        direction: sorter.default.direction
-                    };
-                }).sort((a, b) => a.default.order - b.default.order);
-
-                form.setFieldValue('defaultSorters', JSON.stringify(defaultSorters));
-            }
-            // Set the state
-            setState(data.data);
-        }
-        // Something went wrong fetching filter data
-        else {
-            setState(null);
-        }
-        setIsLoading(false);
-    }, [templateId, form]);
-
-    useEffect(() => {
-        if (templateId) {
-            fetch();
-
-        }
-    }, [templateId, fetch]);
-
-    const filters = useMemo(() => state?.filters || [], [state]);
-    const sorters = useMemo(() => state?.sorters || [], [state]);
-
-    if (!templateId) return null;
-    if (isLoading) return <LoadingSkeleton/>;
-    if (!state) return null;
-
-    return (
-        <div style={{marginTop: '10px'}}>
-            <Checkbox
-                checked={visible}
-                onChange={(e) => setVisible(e.target.checked)}
-                children={t('reportcenter.labels.advanced_filters')}
-            />
-            {visible && (
-                <div>
-                    {filters.length > 0 && (
-                        <FiltersSection filters={filters} form={form} bodyshop={bodyshop}/>
-                    )}
-                    {sorters.length > 0 && (
-                        <SortersSection sorters={sorters} form={form}/>
-                    )}
-                </div>
-            )}
-        </div>
-    );
-}

client/src/components/report-center-modal/report-center-modal-utils.js

@@ -1,161 +0,0 @@
-import {uniqBy} from "lodash";
-
-/**
- * Get value from path
- * @param obj
- * @param path
- * @returns {*}
- */
-const getValueFromPath = (obj, path) => path.split('.').reduce((prev, curr) => prev?.[curr], obj);
-
-/**
- * Generate options from array
- * @param bodyshop
- * @param path
- * @returns {unknown[]}
- */
-const generateOptionsFromArray = (bodyshop, path) => {
-    const options = getValueFromPath(bodyshop, path);
-    return uniqBy(options.map((value) => ({
-        label: value,
-        value: value,
-    })), 'value');
-}
-
-/**
- * Valid internal reflections
- * Note: This is intended for future functionality
- * @type {{special: string[], bodyshop: [{name: string, type: string}]}}
- */
-const VALID_INTERNAL_REFLECTIONS = {
-    bodyshop: [
-        {
-            name: 'md_ro_statuses.statuses',
-            type: 'kv-to-v'
-        }
-    ],
-};
-
-/**
- * Generate options
- * @param bodyshop
- * @param path
- * @param labelPath
- * @param valuePath
- * @returns {{label: *, value: *}[]}
- */
-const generateOptionsFromObject = (bodyshop, path, labelPath, valuePath) => {
-    const options = getValueFromPath(bodyshop, path);
-    return uniqBy(Object.values(options).map((value) => ({
-        label: value[labelPath],
-        value: value[valuePath],
-    })), 'value');
-}
-
-/**
- * Generate special reflections
- * @param bodyshop
- * @param finalPath
- * @param t - i18n
- * @returns {{label: *, value: *}[]|{label: *, value: *}[]|{label: string, value: *}[]|*[]}
- */
-const generateSpecialReflections = (bodyshop, finalPath, t) => {
-    switch (finalPath) {
-        case 'payment_payers':
-            return [
-                {
-                    label: t("payments.labels.customer"),
-                    value: t("payments.labels.customer"),
-                },
-                {
-                    label: t("payments.labels.insurance"),
-                    value: t("payments.labels.insurance"),
-                },
-                // This is a weird one supposedly only used by one shop and could potentially be
-                // placed behind a SplitSDK
-                {
-                    label: t("payments.labels.external"),
-                    value: t("payments.labels.external"),
-                }
-            ];
-        case 'payment_types':
-            return generateOptionsFromArray(bodyshop, 'md_payment_types');
-        case 'alt_transports':
-            return generateOptionsFromArray(bodyshop, 'appt_alt_transport');
-        case 'lost_sale_reasons':
-            return generateOptionsFromArray(bodyshop, 'md_lost_sale_reasons');
-        // Special case because Referral Sources is an Array, not an Object.
-        case 'referral_source':
-            return generateOptionsFromArray(bodyshop, 'md_referral_sources');
-        case 'class':
-            return generateOptionsFromArray(bodyshop, 'md_classes');
-        case 'cost_centers':
-            return generateOptionsFromObject(bodyshop, 'md_responsibility_centers.costs', 'name', 'name');
-        // Special case because Categories is an Array, not an Object.
-        case 'categories':
-            return generateOptionsFromArray(bodyshop, 'md_categories');
-        case 'insurance_companies':
-            return generateOptionsFromObject(bodyshop, 'md_ins_cos', 'name', 'name');
-        case 'employee_teams':
-            return generateOptionsFromObject(bodyshop, 'employee_teams', 'name', 'id');
-        // Special case because Employees uses a concatenation of first_name and last_name
-        case 'employees':
-            const employeesOptions = getValueFromPath(bodyshop, 'employees');
-            return uniqBy(Object.values(employeesOptions).map((value) => ({
-                label: `${value.first_name} ${value.last_name}`,
-                value: value.id,
-            })), 'value');
-        case 'last_names':
-            return generateOptionsFromObject(bodyshop, 'employees', 'last_name', 'last_name');
-        case 'first_names':
-            return generateOptionsFromObject(bodyshop, 'employees', 'first_name', 'first_name');
-        case 'job_statuses':
-            const statusOptions = getValueFromPath(bodyshop, 'md_ro_statuses.statuses');
-            return Object.values(statusOptions).map((value) => ({
-                label: value,
-                value
-            }));
-        default:
-            console.error('Invalid Special reflection provided by  Report Filters');
-            return [];
-    }
-}
-
-/**
- *  Generate bodyshop reflections
- * @param bodyshop
- * @param finalPath
- * @returns {{label: *, value: *}[]|*[]}
- */
-const generateBodyshopReflections = (bodyshop, finalPath) => {
-    const options = getValueFromPath(bodyshop, finalPath);
-    const reflectionRenderer = VALID_INTERNAL_REFLECTIONS.bodyshop.find(reflection => reflection.name === finalPath);
-    if (reflectionRenderer?.type === 'kv-to-v') {
-        return Object.values(options).map((value) => ({
-            label: value,
-            value
-        }));
-    }
-    return [];
-}
-
-/**
- * Generate internal reflections based on the path and bodyshop
- * @param bodyshop
- * @param upperPath
- * @param finalPath
- * @param t - i18n
- * @returns {{label: *, value: *}[]|[]|{label: *, value: *}[]|{label: string, value: *}[]|{label: *, value: *}[]|*[]}
- */
-const generateInternalReflections = ({bodyshop, upperPath, finalPath, t}) => {
-    switch (upperPath) {
-        case 'special':
-            return generateSpecialReflections(bodyshop, finalPath, t);
-        case 'bodyshop':
-            return generateBodyshopReflections(bodyshop, finalPath);
-        default:
-            return [];
-    }
-};
-
-export {generateInternalReflections}

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -1,321 +1,305 @@
-import {useLazyQuery} from "@apollo/client";
-import {Button, Card, Col, DatePicker, Form, Input, Radio, Row, Typography,} from "antd";
+import { useLazyQuery } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Col,
+  DatePicker,
+  Form,
+  Input,
+  Radio,
+  Row,
+  Typography,
+} from "antd";
 import _ from "lodash";
 import moment from "moment";
-import React, {useState} from "react";
-import {useTranslation} from "react-i18next";
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {QUERY_ACTIVE_EMPLOYEES} from "../../graphql/employees.queries";
-import {QUERY_ALL_VENDORS} from "../../graphql/vendors.queries";
-import {selectReportCenter} from "../../redux/modals/modals.selectors";
-import DatePickerRanges from "../../utils/DatePickerRanges";
-import {GenerateDocument} from "../../utils/RenderTemplate";
-import {TemplateList} from "../../utils/TemplateConstants";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { QUERY_ACTIVE_EMPLOYEES } from "../../graphql/employees.queries";
+import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
+import { selectReportCenter } from "../../redux/modals/modals.selectors";
+import DatePIckerRanges from "../../utils/DatePickerRanges";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import "./report-center-modal.styles.scss";
-import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
-import {selectBodyshop} from "../../redux/user/user.selectors";
-
 const mapStateToProps = createStructuredSelector({
-    reportCenterModal: selectReportCenter,
-    bodyshop: selectBodyshop,
+  reportCenterModal: selectReportCenter,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(
-    mapStateToProps,
-    mapDispatchToProps
+  mapStateToProps,
+  mapDispatchToProps
 )(ReportCenterModalComponent);
 
-export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
+export function ReportCenterModalComponent({ reportCenterModal }) {
   const [form] = Form.useForm();
   const [search, setSearch] = useState("");
 
   const [loading, setLoading] = useState(false);
-  const {t} = useTranslation();
+  const { t } = useTranslation();
   const Templates = TemplateList("report_center");
   const ReportsList = Object.keys(Templates).map((key) => {
     return Templates[key];
   });
-  const {open} = reportCenterModal;
+  const { visible } = reportCenterModal;
 
-  const [callVendorQuery, {data: vendorData, called: vendorCalled}] =
-      useLazyQuery(QUERY_ALL_VENDORS, {
-        skip: !(
-            open &&
-            Templates[form.getFieldValue("key")] &&
-            Templates[form.getFieldValue("key")].idtype
-        ),
-      });
+  const [callVendorQuery, { data: vendorData, called: vendorCalled }] =
+    useLazyQuery(QUERY_ALL_VENDORS, {
+      skip: !(
+        visible &&
+        Templates[form.getFieldValue("key")] &&
+        Templates[form.getFieldValue("key")].idtype
+      ),
+    });
 
-  const [callEmployeeQuery, {data: employeeData, called: employeeCalled}] =
-      useLazyQuery(QUERY_ACTIVE_EMPLOYEES, {
-        skip: !(
-            open &&
-            Templates[form.getFieldValue("key")] &&
-            Templates[form.getFieldValue("key")].idtype
-        ),
-      });
+  const [callEmployeeQuery, { data: employeeData, called: employeeCalled }] =
+    useLazyQuery(QUERY_ACTIVE_EMPLOYEES, {
+      skip: !(
+        visible &&
+        Templates[form.getFieldValue("key")] &&
+        Templates[form.getFieldValue("key")].idtype
+      ),
+    });
 
   const handleFinish = async (values) => {
     setLoading(true);
-    const start = values.dates ? values.dates[0] : null;
-    const end = values.dates ? values.dates[1] : null;
+    const start = values.dates[0];
+    const end = values.dates[1];
     const { id } = values;
 
-      const templateConfig = {
-          name: values.key,
-          variables: {
-              ...(start
-                  ? {start: moment(start).startOf("day").format("YYYY-MM-DD")}
-                  : {}),
-              ...(end ? {end: moment(end).endOf("day").format("YYYY-MM-DD")} : {}),
-              ...(start ? {starttz: moment(start).startOf("day")} : {}),
-              ...(end ? {endtz: moment(end).endOf("day")} : {}),
+    await GenerateDocument(
+      {
+        name: values.key,
+        variables: {
+          ...(start
+            ? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
+            : {}),
+          ...(end
+            ? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
+            : {}),
+          ...(start ? { starttz: moment(start).startOf("day") } : {}),
+          ...(end ? { endtz: moment(end).endOf("day") } : {}),
 
-              ...(id ? {id: id} : {}),
-          },
-          filters: values.filters,
-          sorters: values.sorters,
-      };
-
-      if (_.isString(values.defaultSorters) && !_.isEmpty(values.defaultSorters)) {
-          templateConfig.defaultSorters = JSON.parse(values.defaultSorters);
-      }
-
-      await GenerateDocument(
-          templateConfig,
-        {
-          to: values.to,
-          subject: Templates[values.key]?.subject,
+          ...(id ? { id: id } : {}),
         },
-        values.sendbyexcel === "excel"
-            ? "x"
-            : values.sendby === "email"
-                ? "e"
-                : "p",
-        id
+      },
+      {
+        to: values.to,
+        subject: Templates[values.key]?.subject,
+      },
+      values.sendbyexcel === "excel"
+        ? "x"
+        : values.sendby === "email"
+        ? "e"
+        : "p",
+      id
     );
     setLoading(false);
   };
 
   const FilteredReportsList =
-      search !== ""
-          ? ReportsList.filter((r) =>
-              r.title.toLowerCase().includes(search.toLowerCase())
-          )
-          : ReportsList;
+    search !== ""
+      ? ReportsList.filter((r) =>
+          r.title.toLowerCase().includes(search.toLowerCase())
+        )
+      : ReportsList;
 
   //Group it, create cards, and then filter out.
 
   const grouped = _.groupBy(FilteredReportsList, "group");
 
   return (
-      <div>
-        <Form
-            onFinish={handleFinish}
-            autoComplete={"off"}
-            layout="vertical"
-            form={form}
+    <div>
+      <Form
+        onFinish={handleFinish}
+        autoComplete={"off"}
+        layout="vertical"
+        form={form}
+      >
+        <Input.Search
+          onChange={(e) => setSearch(e.target.value)}
+          value={search}
+        />
+        <Form.Item
+          name="key"
+          label={t("reportcenter.labels.key")}
+          //  className="radio-group-columns"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
         >
-          <Input.Search
-              onChange={(e) => setSearch(e.target.value)}
-              value={search}
-          />
-            <Form.Item name="defaultSorters" hidden/>
-            <Form.Item
-              name="key"
-              label={t("reportcenter.labels.key")}
-              //  className="radio-group-columns"
-              rules={[
-                {
-                  required: true,
-                  //message: t("general.validation.required"),
-                },
-              ]}
-          >
-            <Radio.Group>
-              {/* {Object.keys(Templates).map((key) => (
+          <Radio.Group>
+            {/* {Object.keys(Templates).map((key) => (
                 <Radio key={key} value={key}>
                   {Templates[key].title}
                 </Radio>
               ))} */}
 
-              <Row gutter={[16, 16]}>
-                {Object.keys(grouped).map((key) => (
-                    <Col md={8} sm={12} key={key}>
-                      <Card.Grid
-                          style={{
-                            width: "100%",
-                            height: "100%",
-                            maxHeight: "33vh",
-                            overflowY: "scroll",
-                          }}
-                      >
-                        <Typography.Title level={4}>
-                          {t(`reportcenter.labels.groups.${key}`)}
-                        </Typography.Title>
-                        <ul style={{  listStyleType: 'none', columns: "2 auto"}}>
-                          {grouped[key].map((item) => (
-                              <li key={item.key}>
-                                <Radio key={item.key} value={item.key}>
-                                  {item.title}
-                                </Radio>
-                              </li>
-                          ))}
-                        </ul>
-                      </Card.Grid>
-                    </Col>
-                ))}
-              </Row>
-            </Radio.Group>
-          </Form.Item>
-          <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
-            {() => {
-              const key = form.getFieldValue("key");
-              if (!key) return null;
-              //Kind of Id
-              const rangeFilter = Templates[key] && Templates[key].rangeFilter;
-              if (!rangeFilter) return null;
+            <Row gutter={[16, 16]}>
+              {Object.keys(grouped).map((key) => (
+                <Col md={8} sm={12} key={key}>
+                  <Card.Grid
+                    style={{
+                      width: "100%",
+                      height: "100%",
+                      maxHeight: "33vh",
+                      overflowY: "scroll",
+                    }}
+                  >
+                    <Typography.Title level={4}>
+                      {t(`reportcenter.labels.groups.${key}`)}
+                    </Typography.Title>
+                    <ul style={{ columns: "2 auto" }}>
+                      {grouped[key].map((item) => (
+                        <li key={item.key}>
+                          <Radio key={item.key} value={item.key}>
+                            {item.title}
+                          </Radio>
+                        </li>
+                      ))}
+                    </ul>
+                  </Card.Grid>
+                </Col>
+              ))}
+            </Row>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
+          {() => {
+            const key = form.getFieldValue("key");
+            if (!key) return null;
+            //Kind of Id
+            const rangeFilter = Templates[key] && Templates[key].rangeFilter;
+            if (!rangeFilter) return null;
+            return (
+              <div>
+                {t("reportcenter.labels.filterson", {
+                  object: rangeFilter.object,
+                  field: rangeFilter.field,
+                })}
+              </div>
+            );
+          }}
+        </Form.Item>
+        <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
+          {() => {
+            const key = form.getFieldValue("key");
+            const currentId = form.getFieldValue("id");
+            if (!key) return null;
+            //Kind of Id
+            const idtype = Templates[key] && Templates[key].idtype;
+            if (!idtype && currentId) {
+              form.setFieldsValue({ id: null });
+              return null;
+            }
+            if (!vendorCalled && idtype === "vendor") callVendorQuery();
+            if (!employeeCalled && idtype === "employee") callEmployeeQuery();
+            if (idtype === "vendor")
               return (
-                  <div>
-                    {t("reportcenter.labels.filterson", {
-                      object: rangeFilter.object,
-                      field: rangeFilter.field,
-                    })}
-                  </div>
+                <Form.Item
+                  name="id"
+                  label={t("reportcenter.labels.vendor")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <VendorSearchSelect
+                    options={vendorData ? vendorData.vendors : []}
+                  />
+                </Form.Item>
               );
-            }}
-          </Form.Item>
-            <ReportCenterModalFiltersSortersComponent form={form} bodyshop={bodyshop} />
-          <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
-            {() => {
-              const key = form.getFieldValue("key");
-              const currentId = form.getFieldValue("id");
-              if (!key) return null;
-              //Kind of Id
-              const idtype = Templates[key] && Templates[key].idtype;
-              if (!idtype && currentId) {
-                form.setFieldsValue({id: null});
-                return null;
-              }
-              if (!vendorCalled && idtype === "vendor") callVendorQuery();
-              if (!employeeCalled && idtype === "employee") callEmployeeQuery();
-              if (idtype === "vendor")
-                return (
-                    <Form.Item
-                        name="id"
-                        label={t("reportcenter.labels.vendor")}
-                        rules={[
-                          {
-                            required: true,
-                            //message: t("general.validation.required"),
-                          },
-                        ]}
-                    >
-                      <VendorSearchSelect
-                          options={vendorData ? vendorData.vendors : []}
-                      />
-                    </Form.Item>
-                );
-              if (idtype === "employee")
-                return (
-                    <Form.Item
-                        name="id"
-                        label={t("reportcenter.labels.employee")}
-                        rules={[
-                          {
-                            required: true,
-                            //message: t("general.validation.required"),
-                          },
-                        ]}
-                    >
-                      <EmployeeSearchSelect
-                          options={employeeData ? employeeData.employees : []}
-                      />
-                    </Form.Item>
-                );
-              else return null;
-            }}
-          </Form.Item>
-          <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
-            {() => {
-              const key = form.getFieldValue("key");
-              const datedisable = Templates[key] && Templates[key].datedisable;
+            if (idtype === "employee")
+              return (
+                <Form.Item
+                  name="id"
+                  label={t("reportcenter.labels.employee")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <EmployeeSearchSelect
+                    options={employeeData ? employeeData.employees : []}
+                  />
+                </Form.Item>
+              );
+            else return null;
+          }}
+        </Form.Item>
+        <Form.Item
+          name="dates"
+          label={t("reportcenter.labels.dates")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <DatePicker.RangePicker
+            format="MM/DD/YYYY"
+            ranges={DatePIckerRanges}
+          />
+        </Form.Item>
+        <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
+          {() => {
+            const key = form.getFieldValue("key");
+            //Kind of Id
+            const reporttype = Templates[key] && Templates[key].reporttype;
 
-              // TODO: MERGE NOTE, Ranges turns to presets in DatePicker.RangePicker
+            if (reporttype === "excel")
+              return (
+                <Form.Item
+                  label={t("general.labels.sendby")}
+                  name="sendbyexcel"
+                  initialValue="excel"
+                >
+                  <Radio.Group>
+                    <Radio value="excel">{t("general.labels.excel")}</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+            if (reporttype !== "excel")
+              return (
+                <Form.Item
+                  label={t("general.labels.sendby")}
+                  name="sendby"
+                  initialValue="print"
+                >
+                  <Radio.Group>
+                    <Radio value="email">{t("general.labels.email")}</Radio>
+                    <Radio value="print">{t("general.labels.print")}</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+          }}
+        </Form.Item>
 
-              if (datedisable !== true) {
-                return (
-                    <Form.Item
-                        name="dates"
-                        label={t("reportcenter.labels.dates")}
-                        rules={[
-                          {
-                            required: true,
-                            //message: t("general.validation.required"),
-                          },
-                        ]}
-                    >
-                      <DatePicker.RangePicker
-                          format="MM/DD/YYYY"
-                          ranges={DatePickerRanges}
-                      />
-                    </Form.Item>
-                );
-              } else return null;
-            }}
-          </Form.Item>
-          <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
-            {() => {
-              const key = form.getFieldValue("key");
-              //Kind of Id
-              const reporttype = Templates[key] && Templates[key].reporttype;
-
-              if (reporttype === "excel")
-                return (
-                    <Form.Item
-                        label={t("general.labels.sendby")}
-                        name="sendbyexcel"
-                        initialValue="excel"
-                    >
-                      <Radio.Group>
-                        <Radio value="excel">{t("general.labels.excel")}</Radio>
-                      </Radio.Group>
-                    </Form.Item>
-                );
-              if (reporttype !== "excel")
-                return (
-                    <Form.Item
-                        label={t("general.labels.sendby")}
-                        name="sendby"
-                        initialValue="print"
-                    >
-                      <Radio.Group>
-                        <Radio value="email">{t("general.labels.email")}</Radio>
-                        <Radio value="print">{t("general.labels.print")}</Radio>
-                      </Radio.Group>
-                    </Form.Item>
-                );
-            }}
-          </Form.Item>
-
-          <div
-              style={{
-                display: "flex",
-                justifyContent: "center",
-                marginTop: "1rem",
-              }}
-          >
-            <Button onClick={() => form.submit()} style={{}} loading={loading}>
-              {t("reportcenter.actions.generate")}
-            </Button>
-          </div>
-        </Form>
-      </div>
+        <div
+          style={{
+            display: "flex",
+            justifyContent: "center",
+            marginTop: "1rem",
+          }}
+        >
+          <Button onClick={() => form.submit()} style={{}} loading={loading}>
+            {t("reportcenter.actions.generate")}
+          </Button>
+        </div>
+      </Form>
+    </div>
   );
 }
-

client/src/components/report-center-modal/report-center-modal.container.jsx

@@ -5,7 +5,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
-import RbacWrapperComponent from "../rbac-wrapper/rbac-wrapper.component";
 import ReportCenterModalComponent from "./report-center-modal.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -34,9 +33,7 @@ export function ReportCenterModalContainer({
       destroyOnClose
       width="80%"
     >
-      <RbacWrapperComponent action="shop:reportcenter">
-        <ReportCenterModalComponent />
-      </RbacWrapperComponent>
+      <ReportCenterModalComponent />
     </Modal>
   );
 }

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

@@ -34,8 +34,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function ScheduleJobModalContainer({
@@ -146,7 +146,6 @@ export function ScheduleJobModalContainer({
         operation: AuditTrailMapping.appointmentinsert(
           DateTimeFormat(values.start)
         ),
-        type: "appointmentinsert",
       });
     }
 
@@ -217,7 +216,6 @@ export function ScheduleJobModalContainer({
       okButtonProps={{
         loading: loading,
       }}
-      closable={false}
     >
       <Form
         form={form}

client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx

@@ -25,8 +25,6 @@ export function ScoreboardDayStats({ bodyshop, date, entries }) {
     return acc + value.bodyhrs;
   }, 0);
 
-  const numJobs = entries.length;
-
   return (
     <Card
       title={moment(date).format("D - ddd")}
@@ -35,18 +33,17 @@ export function ScoreboardDayStats({ bodyshop, date, entries }) {
     >
       <Statistic
         valueStyle={{ color: dailyBodyTarget > bodyHrs ? "red" : "green" }}
-        label="Body"
+        label="B"
         value={bodyHrs.toFixed(1)}
       />
       <Statistic
         valueStyle={{ color: dailyPaintTarget > paintHrs ? "red" : "green" }}
-        label="Refinish"
+        label="P"
         value={paintHrs.toFixed(1)}
       />
       <Divider style={{ margin: 0 }} />
-      <Statistic label="Total" value={(bodyHrs + paintHrs).toFixed(1)} />
-      <Divider style={{ margin: 0 }} />
-      <Statistic label="Jobs" value={numJobs} />
+
+      <Statistic value={(bodyHrs + paintHrs).toFixed(1)} />
     </Card>
   );
 }

client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx

@@ -1,14 +1,5 @@
 import { useMutation } from "@apollo/client";
-import {
-  Button,
-  Card,
-  Dropdown,
-  Form,
-  InputNumber,
-  notification,
-  Space,
-} from "antd";
-import moment from "moment";
+import { Button, Card, Dropdown, Form, InputNumber, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
@@ -22,7 +13,6 @@ export default function ScoreboardEntryEdit({ entry }) {
 
   const handleFinish = async (values) => {
     setLoading(true);
-    values.date = moment(values.date).format("YYYY-MM-DD");
     const result = await updateScoreboardentry({
       variables: { sbId: entry.id, sbInput: values },
     });
@@ -87,14 +77,13 @@ export default function ScoreboardEntryEdit({ entry }) {
         >
           <InputNumber precision={1} />
         </Form.Item>
-        <Space wrap>
-          <Button type="primary" loading={loading} htmlType="submit">
-            {t("general.actions.save")}
-          </Button>
-          <Button onClick={() => setVisible(false)}>
-            {t("general.actions.cancel")}
-          </Button>
-        </Space>
+
+        <Button type="primary" loading={loading} htmlType="submit">
+          {t("general.actions.save")}
+        </Button>
+        <Button onClick={() => setVisible(false)}>
+          {t("general.actions.cancel")}
+        </Button>
       </Form>
     </Card>
   );

client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx

@@ -1,4 +1,3 @@
-import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Input, Modal, Space, Table, Typography } from "antd";
 import React, { useState } from "react";
@@ -6,14 +5,12 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { QUERY_SCOREBOARD_PAGINATED } from "../../graphql/scoreboard.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
-import { alphaSort, dateSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.component";
 import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component";
+import { SyncOutlined } from "@ant-design/icons";
+import {pageLimit} from "../../utils/config";
 export default function ScoreboardJobsList({ scoreBoardlist }) {
   const { t } = useTranslation();
   const [state, setState] = useState({
@@ -47,7 +44,6 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.job.id}>
           {record.job.ro_number || t("general.labels.na")}
@@ -59,11 +55,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          OwnerNameDisplayFunction(a.job),
-          OwnerNameDisplayFunction(b.job)
-        ),
+
       render: (text, record) => <OwnerNameDisplay ownerObject={record.job} />,
     },
     {
@@ -71,15 +63,6 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.job.v_model_yr || ""} ${a.job.v_make_desc || ""} ${
-            a.job.v_model_desc || ""
-          }`,
-          `${b.job.v_model_yr || ""} ${b.job.v_make_desc || ""} ${
-            b.job.v_model_desc || ""
-          }`
-        ),
       render: (text, record) => (
         <span>{`${record.job.v_model_yr || ""} ${
           record.job.v_make_desc || ""
@@ -90,20 +73,17 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
       title: t("scoreboard.fields.date"),
       dataIndex: "date",
       key: "date",
-      sorter: (a, b) => dateSort(a.date, b.date),
       render: (text, record) => <DateFormatter>{record.date}</DateFormatter>,
     },
-    {
-      title: t("scoreboard.fields.bodyhrs"),
-      dataIndex: "bodyhrs",
-      key: "bodyhrs",
-      sorter: (a, b) => Number(a.bodyhrs) - Number(b.bodyhrs),
-    },
     {
       title: t("scoreboard.fields.painthrs"),
       dataIndex: "painthrs",
       key: "painthrs",
-      sorter: (a, b) => Number(a.painthrs) - Number(b.painthrs),
+    },
+    {
+      title: t("scoreboard.fields.bodyhrs"),
+      dataIndex: "bodyhrs",
+      key: "bodyhrs",
     },
     {
       title: t("general.labels.actions"),
@@ -124,9 +104,8 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
         visible={state.visible}
         destroyOnClose
         width="80%"
-        closable={false}
         cancelButtonProps={{ style: { display: "none" } }}
-        onOk={() =>
+        onCancel={() =>
           setState((state) => ({
             ...state,
             visible: false,