Merged in release/2024-08-23-LEGACY (pull request #1639)

IO-2887 Null out BillData if returnfrombill is not available

.circleci/config.yml

@@ -42,31 +42,22 @@ 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: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
+          command: npm i
 
-      - run: yarn run build
+      - run: npm run build
 
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-production/"
+          arguments: "--exclude '*.map'"
       - jira/notify
 
   test-hasura-migrate:
@@ -92,31 +83,22 @@ 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: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
+          command: npm i
 
-      - run: yarn run build:test
+      - run: npm run build:test
 
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-test/"
+          arguments: "--exclude '*.map'"
       - jira/notify
 
   admin-app-build:
@@ -152,10 +134,6 @@ jobs:
 workflows:
   deploy_and_build:
     jobs:
-      - api-deploy:
-          filters:
-            branches:
-              only: master
       - app-build:
           filters:
             branches:
@@ -177,4 +155,4 @@ workflows:
       #- admin-app-build:
       #filters:
       #branches:
-      #only: master
+      #only: master

.prettierrc.js

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,189 @@
+# 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=false
+GENERATE_SOURCEMAP=true
 REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
 REACT_APP_GA_CODE=231103507

client/.gitignore

@@ -0,0 +1,3 @@
+
+# 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,12 +13,14 @@
         "@craco/craco": "^7.0.0",
         "@fingerprintjs/fingerprintjs": "^3.4.2",
         "@jsreport/browser-client": "^3.1.0",
-        "@sentry/react": "^7.40.0",
+        "@sentry/cli": "^2.27.0",
+        "@sentry/react": "^7.99.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",
@@ -4214,40 +4216,195 @@
       "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==",
       "license": "MIT"
     },
-    "node_modules/@sentry/browser": {
-      "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",
+    "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.40.0",
-        "@sentry/replay": "7.40.0",
-        "@sentry/types": "7.40.0",
-        "@sentry/utils": "7.40.0",
-        "tslib": "^1.9.3"
+        "@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/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-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==",
+      "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"
+      },
+      "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/cli": {
-      "version": "1.74.6",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.74.6.tgz",
-      "integrity": "sha512-pJ7JJgozyjKZSTjOGi86chIngZMLUlYt2HOog+OJn+WGvqEkVymu8m462j1DiXAnex9NspB4zLLNuZ/R6rTQHg==",
-      "dev": true,
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.27.0.tgz",
+      "integrity": "sha512-pc0opd71W8lGhYvmB1keQtJkarxzCS9f9ErKYv6TfXOOX6drvwkyA6vD/6xEnpzyvqGAuGRU4T4sEeLD3irwUQ==",
       "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"
@@ -4256,7 +4413,124 @@
         "sentry-cli": "bin/sentry-cli"
       },
       "engines": {
-        "node": ">= 8"
+        "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_modules/@sentry/core": {
@@ -4280,16 +4554,15 @@
       "license": "0BSD"
     },
     "node_modules/@sentry/react": {
-      "version": "7.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.40.0.tgz",
-      "integrity": "sha512-7yYagpOCdsXnVTtLL8Y7wAf2xXgsk2ncuju3O/G4kEckkLewZWmQeoknOSGFlAgVdGNhTaXc2WGzgOiBMOkhug==",
-      "license": "MIT",
+      "version": "7.99.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.99.0.tgz",
+      "integrity": "sha512-RtHwgzMHJhzJfSQpVG0SDPQYMTGDX3Q37/YWI59S4ALMbSW4/F6n/eQAvGVYZKbh2UCSqgFuRWaXOYkSZT17wA==",
       "dependencies": {
-        "@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"
+        "@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"
       },
       "engines": {
         "node": ">=8"
@@ -4298,26 +4571,82 @@
         "react": "15.x || 16.x || 17.x || 18.x"
       }
     },
-    "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/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/replay": {
-      "version": "7.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.40.0.tgz",
-      "integrity": "sha512-Y9Kvo9jKouUdrHQhHVv5SmWZClF5o7BFI6oVpLlv4zXORPQlyoZONM/9sxiMvvH73alDSpxzCoxyhlypAOH4ww==",
-      "license": "MIT",
+      "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==",
       "dependencies": {
-        "@sentry/core": "7.40.0",
-        "@sentry/types": "7.40.0",
-        "@sentry/utils": "7.40.0"
+        "@sentry-internal/tracing": "7.99.0",
+        "@sentry/core": "7.99.0",
+        "@sentry/types": "7.99.0",
+        "@sentry/utils": "7.99.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",
@@ -4381,6 +4710,27 @@
         "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",
@@ -6112,12 +6462,21 @@
         "@apollo/client": "^3.0.0"
       }
     },
-    "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/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/arch": {
       "version": "2.2.0",
@@ -6140,17 +6499,6 @@
       ],
       "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",
@@ -7571,16 +7919,6 @@
         "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",
@@ -7743,13 +8081,6 @@
         "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",
@@ -8911,13 +9242,6 @@
         "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",
@@ -9218,6 +9542,28 @@
         "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",
@@ -10464,6 +10810,8 @@
     },
     "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"
     },
@@ -11283,74 +11631,6 @@
         "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",
@@ -11753,13 +12033,6 @@
         "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",
@@ -15744,19 +16017,6 @@
         "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",
@@ -15769,16 +16029,6 @@
         "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",
@@ -17794,7 +18044,6 @@
       "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"
@@ -20526,13 +20775,6 @@
         "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",
@@ -22110,19 +22352,6 @@
         "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",
@@ -23080,16 +23309,6 @@
         "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,12 +9,14 @@
     "@craco/craco": "^7.0.0",
     "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@jsreport/browser-client": "^3.1.0",
-    "@sentry/react": "^7.40.0",
+    "@sentry/cli": "^2.27.0",
+    "@sentry/react": "^7.99.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",
@@ -88,13 +90,14 @@
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
-    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
+    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build && npm run sentry:sourcemaps",
     "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 ."
+    "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
+    "sentry:sourcemaps": "sentry-cli sourcemaps inject --org imex --project imexonline ./build && sentry-cli sourcemaps upload --org imex --project imexonline ./build"
   },
   "eslintConfig": {
     "extends": [

client/src/App/App.container.jsx

@@ -8,6 +8,7 @@ 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");
 
@@ -18,7 +19,7 @@ export const factory = SplitSdk({
   },
 });
 
-export default function AppContainer() {
+function AppContainer() {
   const { t } = useTranslation();
 
   return (
@@ -42,3 +43,5 @@ export default function AppContainer() {
     </ApolloProvider>
   );
 }
+
+export default Sentry.withProfiler(AppContainer);

client/src/App/App.jsx

@@ -22,6 +22,7 @@ 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")
@@ -57,7 +58,6 @@ export function App({
     if (!navigator.onLine) {
       setOnline(false);
     }
-
     checkUserSession();
   }, [checkUserSession, setOnline]);
 
@@ -73,6 +73,7 @@ export function App({
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
+
   useEffect(() => {
     if (currentUser.authorized && bodyshop) {
       client.setAttribute("imexshopid", bodyshop.imexshopid);
@@ -107,6 +108,8 @@ 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 { Input, Table, Checkbox, Card, Space } from "antd";
+import { Card, Checkbox, Input, Space, Table } from "antd";
+import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
-import PayableExportButton from "../payable-export-button/payable-export-button.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 { 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 {pageLimit} from "../../utils/config";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -138,7 +138,6 @@ export function AccountingPayablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
-
       render: (text, record) => (
         <ExportLogsCountDisplay logs={record.exportlogs} />
       ),
@@ -147,8 +146,6 @@ 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,14 +8,16 @@ 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 from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -75,7 +77,11 @@ export function AccountingPayablesTableComponent({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(
+          OwnerNameDisplayFunction(a.job),
+          OwnerNameDisplayFunction(b.job)
+        ),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -94,6 +100,9 @@ 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>
       ),
@@ -112,18 +121,21 @@ 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",
@@ -137,8 +149,6 @@ 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,17 +4,19 @@ 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 } from "../../utils/sorters";
+import { alphaSort, dateSort, statusSort } 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 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";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -63,7 +65,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => a.status - b.status,
+      sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
@@ -83,7 +85,8 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -103,6 +106,15 @@ 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,10 +3,22 @@ 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";
 
-export default function BillDeleteButton({ bill, callback }) {
+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 }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -36,6 +48,11 @@ export default function BillDeleteButton({ bill, callback }) {
 
     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

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, PageHeader, Popconfirm, Space } from "antd";
+import { Button, Divider, Form, PageHeader, Popconfirm, Space } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useState } from "react";
@@ -33,8 +33,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -150,6 +150,7 @@ export function BillDetailEditcontainer({
       jobid: bill.jobid,
       billid: search.billid,
       operation: AuditTrailMapping.billupdated(bill.invoice_number),
+      type: "billupdated",
     });
 
     await refetch();
@@ -163,6 +164,7 @@ export function BillDetailEditcontainer({
   if (!search.billid) return <></>; //<div>{t("bills.labels.noneselected")}</div>;
 
   const exported = data && data.bills_by_pk && data.bills_by_pk.exported;
+  const isinhouse = data && data.bills_by_pk && data.bills_by_pk.isinhouse;
 
   return (
     <>
@@ -206,8 +208,8 @@ export function BillDetailEditcontainer({
             initialValues={transformData(data)}
             layout="vertical"
           >
-            <BillFormContainer form={form} billEdit disabled={exported} />
-
+            <BillFormContainer form={form} billEdit disabled={exported} disableInHouse={isinhouse}/>
+            <Divider orientation="left">{t("general.labels.media")}</Divider>
             {bodyshop.uselocalmediaserver ? (
               <JobsDocumentsLocalGallery
                 job={{ id: data ? data.bills_by_pk.jobid : null }}

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

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

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 }) =>
-    dispatch(insertAuditTrail({ jobid, billid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation, type })),
 });
 
 const Templates = TemplateList("job_special");
@@ -94,6 +94,7 @@ function BillEnterModalContainer({
       location,
       outstanding_returns,
       inventory,
+      federal_tax_exempt,
       ...remainingValues
     } = values;
 
@@ -170,6 +171,7 @@ function BillEnterModalContainer({
             mod_lbr_ty: key,
             hours: adjustmentsToInsert[key].toFixed(1),
           }),
+          type: "jobmodifylbradj",
         });
       });
 
@@ -319,6 +321,7 @@ 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

@@ -47,6 +47,7 @@ export function BillFormComponent({
   loadLines,
   billEdit,
   disableInvNumber,
+  disableInHouse,
   job,
   loadOutstandingReturns,
   loadInventory,
@@ -198,7 +199,7 @@ export function BillFormComponent({
           ]}
         >
           <VendorSearchSelect
-            disabled={disabled}
+            disabled={disabled || disableInHouse}
             options={vendorAutoCompleteOptions}
             preferredMake={preferredMake}
             onSelect={handleVendorSelect}
@@ -271,7 +272,7 @@ export function BillFormComponent({
             }),
           ]}
         >
-          <Input disabled={disabled || disableInvNumber} />
+          <Input disabled={disabled || disableInvNumber || disableInHouse} />
         </Form.Item>
         <Form.Item
           label={t("bills.fields.date")}
@@ -504,10 +505,11 @@ export function BillFormComponent({
           billEdit={billEdit}
         />
       )}
-
+      <Divider orientation="left" style={{ display: billEdit ? "none" : null }}>
+        {t("documents.labels.upload")}
+      </Divider>
       <Form.Item
         name="upload"
-        label="Upload"
         style={{ display: billEdit ? "none" : null }}
         valuePropName="fileList"
         getValueFromEvent={(e) => {

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

@@ -22,6 +22,7 @@ export function BillFormContainer({
   billEdit,
   disabled,
   disableInvNumber,
+  disableInHouse
 }) {
   const { Simple_Inventory } = useTreatments(
     ["Simple_Inventory"],
@@ -57,6 +58,7 @@ export function BillFormContainer({
         job={lineData ? lineData.jobs_by_pk : null}
         responsibilityCenters={bodyshop.md_responsibility_centers || null}
         disableInvNumber={disableInvNumber}
+        disableInHouse={disableInHouse}
         loadOutstandingReturns={loadOutstandingReturns}
         loadInventory={loadInventory}
         preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}

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 { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import BillDeleteButton from "../bill-delete-button/bill-delete-button.component";
 import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-return.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
@@ -58,9 +58,9 @@ export function BillsListTableComponent({
           <EditFilled />
         </Button>
       )}
-      <BillDeleteButton bill={record} />
+      <BillDeleteButton bill={record} jobid={job.id} />
       <BillDetailEditReturnComponent
-        data={{ bills_by_pk: { ...record, jobid: job.id } }}
+        data={{ bills_by_pk: { ...record, jobid: job.id, job: job } }}
         disabled={
           record.is_credit_memo ||
           record.vendorid === bodyshop.inhousevendorid ||

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

@@ -1,8 +1,8 @@
-import React, { useState } from "react";
-import { Button, Form, InputNumber, Popover } from "antd";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { useTranslation } from "react-i18next";
 import { CalculatorFilled } from "@ant-design/icons";
+import { Button, Form, InputNumber, Popover, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function CABCpvrtCalculator({ disabled, form }) {
   const [visibility, setVisibility] = useState(false);
 
@@ -26,10 +26,14 @@ export default function CABCpvrtCalculator({ disabled, form }) {
         <Form.Item name="days" label={t("jobs.labels.ca_bc_pvrt.days")}>
           <InputNumber precision={0} min={0} />
         </Form.Item>
-        <Button type="primary" htmlType="submit">
-          {t("general.actions.calculate")}
-        </Button>
-        <Button onClick={() => setVisibility(false)}>Close</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" htmlType="submit">
+              {t("general.actions.calculate")}
+            </Button>
+            <Button onClick={() => setVisibility(false)}>Close</Button>
+          </Space>
+        </div>
       </Form>
     </div>
   );

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

@@ -13,7 +13,6 @@ import {
   notification,
 } from "antd";
 import axios from "axios";
-import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -22,7 +21,6 @@ import {
   INSERT_PAYMENT_RESPONSE,
   QUERY_RO_AND_OWNER_BY_JOB_PKS,
 } from "../../graphql/payment_response.queries";
-import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
@@ -37,8 +35,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -48,12 +46,12 @@ const CardPaymentModalComponent = ({
   toggleModalVisible,
   insertAuditTrail,
 }) => {
-  const { context } = cardPaymentModal;
+  const { context, actions } = cardPaymentModal;
 
   const [form] = Form.useForm();
 
   const [loading, setLoading] = useState(false);
-  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
+  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
   const { t } = useTranslation();
 
@@ -65,7 +63,6 @@ const CardPaymentModalComponent = ({
     }
   );
 
-  console.log("🚀 ~ file: card-payment-modal.component..jsx:61 ~ data:", data);
   //Initialize the intellipay window.
   const SetIntellipayCallbackFunctions = () => {
     console.log("*** Set IntelliPay callback functions.");
@@ -74,16 +71,20 @@ const CardPaymentModalComponent = ({
     });
 
     window.intellipay.runOnApproval(async function (response) {
-      console.warn("*** Running On Approval Script ***");
-      form.setFieldValue("paymentResponse", response);
-      form.submit();
+      //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
+      //Add a slight delay to allow the refetch to properly get the data.
+      setTimeout(() => {
+        if (actions && actions.refetch && typeof actions.refetch === "function")
+          actions.refetch();
+        setLoading(false);
+        toggleModalVisible();
+      }, 750);
     });
 
     window.intellipay.runOnNonApproval(async function (response) {
       // Mutate unsuccessful payment
 
       const { payments } = form.getFieldsValue();
-
       await insertPaymentResponse({
         variables: {
           paymentResponse: payments.map((payment) => ({
@@ -102,55 +103,15 @@ const CardPaymentModalComponent = ({
         insertAuditTrail({
           jobid: payment.jobid,
           operation: AuditTrailMapping.failedpayment(),
+          type: "failedpayment",
         })
       );
     });
   };
 
-  const handleFinish = async (values) => {
-    try {
-      await insertPayment({
-        variables: {
-          paymentInput: values.payments.map((payment) => ({
-            amount: payment.amount,
-            transactionid: (values.paymentResponse.paymentid || "").toString(),
-            payer: t("payments.labels.customer"),
-            type: values.paymentResponse.cardbrand,
-            jobid: payment.jobid,
-            date: moment(Date.now()),
-            payment_responses: {
-              data: [
-                {
-                  amount: payment.amount,
-                  bodyshopid: bodyshop.id,
-
-                  jobid: payment.jobid,
-                  declinereason: values.paymentResponse.declinereason,
-                  ext_paymentid: values.paymentResponse.paymentid.toString(),
-                  successful: true,
-                  response: values.paymentResponse,
-                },
-              ],
-            },
-          })),
-        },
-        refetchQueries: ["GET_JOB_BY_PK"],
-      });
-      toggleModalVisible();
-    } catch (error) {
-      console.error(error);
-      notification.open({
-        type: "error",
-        message: t("payments.errors.inserting", { error: error.message }),
-      });
-    } finally {
-      setLoading(false);
-    }
-  };
 
   const handleIntelliPayCharge = async () => {
     setLoading(true);
-
     //Validate
     try {
       await form.validateFields();
@@ -163,6 +124,7 @@ const CardPaymentModalComponent = ({
       const response = await axios.post("/intellipay/lightbox_credentials", {
         bodyshop,
         refresh: !!window.intellipay,
+        paymentSplitMeta: form.getFieldsValue(),
       });
 
       if (window.intellipay) {
@@ -191,7 +153,6 @@ const CardPaymentModalComponent = ({
     <Card title="Card Payment">
       <Spin spinning={loading}>
         <Form
-          onFinish={handleFinish}
           form={form}
           layout="vertical"
           initialValues={{
@@ -272,23 +233,14 @@ const CardPaymentModalComponent = ({
             }
           >
             {() => {
-              console.log("Updating the owner info section.");
               //If all of the job ids have been fileld in, then query and update the IP field.
               const { payments } = form.getFieldsValue();
               if (
                 payments?.length > 0 &&
                 payments?.filter((p) => p?.jobid).length === payments?.length
               ) {
-                console.log("**Calling refetch.");
                 refetch({ jobids: payments.map((p) => p.jobid) });
               }
-              console.log(
-                "Acc info",
-                data,
-                payments && data && data.jobs.length > 0
-                  ? data.jobs.map((j) => j.ro_number).join(", ")
-                  : null
-              );
               return (
                 <>
                   <Input
@@ -343,6 +295,13 @@ const CardPaymentModalComponent = ({
                     value={totalAmountToCharge?.toFixed(2)}
                     hidden
                   />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="comment"
+                    //type="hidden"
+                    value={btoa(JSON.stringify(payments))}
+                    hidden
+                  />
                   <Button
                     type="primary"
                     //  data-ipayname="submit"
@@ -357,11 +316,6 @@ const CardPaymentModalComponent = ({
               );
             }}
           </Form.Item>
-
-          {/* Lightbox payment response when it is completed */}
-          <Form.Item name="paymentResponse" hidden>
-            <Input type="hidden" />
-          </Form.Item>
         </Form>
       </Spin>
     </Card>

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

@@ -68,6 +68,30 @@ 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
@@ -90,16 +114,17 @@ export default function ContractFormComponent({
           >
             {() => {
               const mileageOver =
-                selectedCar &&
-                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
-
+                selectedCar && selectedCar.nextservicekm
+                  ? selectedCar.nextservicekm <= form.getFieldValue("kmstart")
+                  : false;
               const dueForService =
                 selectedCar &&
                 selectedCar.nextservicedate &&
-                moment(selectedCar.nextservicedate).isBefore(
-                  moment(form.getFieldValue("scheduledreturn"))
-                );
-
+                moment(selectedCar.nextservicedate)
+                  .endOf("day")
+                  .isSameOrBefore(
+                    moment(form.getFieldValue("scheduledreturn"))
+                  );
               if (mileageOver || dueForService)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
@@ -117,7 +142,6 @@ export default function ContractFormComponent({
                     </span>
                   </Space>
                 );
-
               return <></>;
             }}
           </Form.Item>

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

@@ -10,11 +10,15 @@ import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel
 import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
+export default function CourtesyCarCreateFormComponent({
+  form,
+  saveLoading,
+  newCC,
+}) {
   const { t } = useTranslation();
   const client = useApolloClient();
 
@@ -33,7 +37,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         }
       />
 
-      {/* <FormFieldsChanged form={form} /> */}
+      {newCC ? null : <FormFieldsChanged form={form} />}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
         <Form.Item
           label={t("courtesycars.fields.year")}
@@ -214,10 +218,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.readiness")}
-          name="readiness"
-        >
+        <Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
           <CourtesyCarReadiness />
         </Form.Item>
         <div>
@@ -234,8 +235,9 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           >
             {() => {
               const nextservicekm = form.getFieldValue("nextservicekm");
-              const mileageOver =
-                nextservicekm && nextservicekm <= form.getFieldValue("mileage");
+              const mileageOver = nextservicekm
+                ? nextservicekm <= form.getFieldValue("mileage")
+                : false;
               if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>

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

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

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

@@ -17,13 +17,18 @@ 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 = [
@@ -50,11 +55,16 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       dataIndex: "status",
       key: "status",
       sorter: (a, b) => alphaSort(a.status, b.status),
+      filteredValue: filter?.status || null,
       filters: [
         {
           text: t("courtesycars.status.in"),
           value: "courtesycars.status.in",
         },
+        {
+          text: t("courtesycars.status.inservice"),
+          value: "courtesycars.status.inservice",
+        },
         {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
@@ -67,23 +77,43 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.leasereturn"),
           value: "courtesycars.status.leasereturn",
         },
+        {
+          text: t("courtesycars.status.unavailable"),
+          value: "courtesycars.status.unavailable",
+        },
       ],
-      onFilter: (value, record) => value.includes(record.status),
+      onFilter: (value, record) => record.status === value,
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
-        const { nextservicedate, nextservicekm, mileage } = record;
+        const { nextservicedate, nextservicekm, mileage, insuranceexpires } =
+          record;
 
-        const mileageOver = nextservicekm <= mileage;
+        const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
 
         const dueForService =
-          nextservicedate && moment(nextservicedate).isBefore(moment());
+          nextservicedate &&
+          moment(nextservicedate).endOf("day").isSameOrBefore(moment());
+
+        const insuranceOver =
+          insuranceexpires &&
+          moment(insuranceexpires).endOf("day").isBefore(moment());
 
         return (
           <Space>
             {t(record.status)}
-            {(mileageOver || dueForService) && (
-              <Tooltip title={t("contracts.labels.cardueforservice")}>
+            {(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")
+                }
+              >
                 <WarningFilled style={{ color: "tomato" }} />
               </Tooltip>
             )}
@@ -96,6 +126,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       dataIndex: "readiness",
       key: "readiness",
       sorter: (a, b) => alphaSort(a.readiness, b.readiness),
+      filteredValue: filter?.readiness || null,
       filters: [
         {
           text: t("courtesycars.readiness.ready"),
@@ -155,7 +186,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       title: t("courtesycars.fields.fuel"),
       dataIndex: "fuel",
       key: "fuel",
-      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
+      sorter: (a, b) => a.fuel - b.fuel,
       sortOrder:
         state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
       render: (text, record) => {
@@ -164,12 +195,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             return t("courtesycars.labels.fuel.full");
           case 88:
             return t("courtesycars.labels.fuel.78");
+          case 75:
+            return t("courtesycars.labels.fuel.34");
           case 63:
             return t("courtesycars.labels.fuel.58");
           case 50:
             return t("courtesycars.labels.fuel.12");
           case 38:
-            return t("courtesycars.labels.fuel.34");
+            return t("courtesycars.labels.fuel.38");
           case 25:
             return t("courtesycars.labels.fuel.14");
           case 13:
@@ -211,7 +244,8 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    setState({ ...state, sortedInfo: sorter });
+    setFilter(filters);
   };
 
   const tableData = searchText

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

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

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

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

@@ -3,21 +3,32 @@ import {
   ExclamationCircleFilled,
   PauseCircleOutlined,
 } from "@ant-design/icons";
-import { Card, Space, Table, Tooltip } from "antd";
+import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
+import { TimeFormatter } from "../../../utils/DateFormatter";
+import { onlyUnique } from "../../../utils/arrayHelper";
+import { alphaSort, dateSort } from "../../../utils/sorters";
+import useLocalStorage from "../../../utils/useLocalStorage";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} 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} />;
@@ -31,6 +42,12 @@ 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,
@@ -49,7 +66,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
         v_vin: item.job.v_vin,
         vehicleid: item.job.vehicleid,
         note: item.note,
-        start: moment(item.start).format("hh:mm a"),
+        start: item.start,
         title: item.title,
       };
       appt.push(i);
@@ -59,11 +76,192 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
     return new moment(a.start) - new moment(b.start);
   });
 
-  const columns = [
+  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}
@@ -91,7 +289,10 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       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
@@ -108,23 +309,16 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       },
     },
     {
-      title: t("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
+      title: t("dashboard.labels.phone"),
+      dataIndex: "ownr_ph",
+      key: "ownr_ph",
       ellipsis: true,
       responsive: ["md"],
       render: (text, record) => (
-        <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} />
+        <Space size="small" wrap>
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+        </Space>
       ),
     },
     {
@@ -134,7 +328,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       ellipsis: true,
       responsive: ["md"],
       render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid} />
+        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
       ),
     },
     {
@@ -142,6 +336,15 @@ 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
@@ -165,43 +368,80 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       key: "ins_co_nm",
       ellipsis: true,
       responsive: ["md"],
-    },
-    {
-      title: t("appointments.fields.time"),
-      dataIndex: "start",
-      key: "start",
-      ellipsis: true,
-      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder:
+        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
+      filters:
+        (appt &&
+          appt
+            .map((j) => j.ins_co_nm)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Ins. Co.*",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.ins_co_nm),
     },
     {
       title: t("appointments.fields.alt_transport"),
       dataIndex: "alt_transport",
       key: "alt_transport",
       ellipsis: true,
-      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+      sortOrder:
+        state.sortedInfo.columnKey === "alt_transport" &&
+        state.sortedInfo.order,
+      filters:
+        (appt &&
+          appt
+            .map((j) => j.alt_transport)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Alt. Transport",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
     },
   ];
 
-  const handleTableChange = (sorter) => {
-    setState({ ...state, sortedInfo: sorter });
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
   return (
     <Card
-      title={t("dashboard.titles.scheduledintoday", {
+      title={t("dashboard.titles.scheduledindate", {
         date: moment().startOf("day").format("MM/DD/YYYY"),
       })}
+      extra={
+        <Space>
+          <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
+          <Switch
+            onClick={() => setIsTvModeScheduledIn(!isTvModeScheduledIn)}
+            defaultChecked={isTvModeScheduledIn}
+          />
+        </Space>
+      }
       {...cardProps}
     >
       <div style={{ height: "100%" }}>
         <Table
           onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: pageLimit }}
-          columns={columns}
+          pagination={false}
+          columns={isTvModeScheduledIn ? tvColumns : columns}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
           dataSource={appt}
+          size={isTvModeScheduledIn ? "small" : "middle"}
         />
       </div>
     </Card>
@@ -220,6 +460,10 @@ 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,37 +3,272 @@ import {
   ExclamationCircleFilled,
   PauseCircleOutlined,
 } from "@ant-design/icons";
-import { Card, Space, Table, Tooltip } from "antd";
+import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
+import { TimeFormatter } from "../../../utils/DateFormatter";
+import { onlyUnique } from "../../../utils/arrayHelper";
+import { alphaSort, dateSort } from "../../../utils/sorters";
+import useLocalStorage from "../../../utils/useLocalStorage";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} 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.scheduled_completion= moment(item.scheduled_completion).format("hh:mm a")
+    item.joblines_body = item.joblines
+      ? item.joblines
+          .filter((l) => l.mod_lbr_ty !== "LAR")
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+      : 0;
+    item.joblines_ref = item.joblines
+      ? item.joblines
+          .filter((l) => l.mod_lbr_ty === "LAR")
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+      : 0;
   });
   data.scheduled_out_today.sort(function (a, b) {
     return new Date(a.scheduled_completion) - new Date(b.scheduled_completion);
   });
 
-  const columns = [
+  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}
@@ -61,7 +296,10 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       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
@@ -78,23 +316,16 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       },
     },
     {
-      title: t("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
+      title: t("dashboard.labels.phone"),
+      dataIndex: "ownr_ph",
+      key: "ownr_ph",
       ellipsis: true,
       responsive: ["md"],
       render: (text, record) => (
-        <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} />
+        <Space size="small" wrap>
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+        </Space>
       ),
     },
     {
@@ -104,7 +335,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       ellipsis: true,
       responsive: ["md"],
       render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid} />
+        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
       ),
     },
     {
@@ -112,6 +343,15 @@ 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
@@ -135,43 +375,80 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       key: "ins_co_nm",
       ellipsis: true,
       responsive: ["md"],
-    },
-    {
-      title: t("jobs.fields.scheduled_completion"),
-      dataIndex: "scheduled_completion",
-      key: "scheduled_completion",
-      ellipsis: true,
-      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder:
+        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
+      filters:
+        (data.scheduled_out_today &&
+          data.scheduled_out_today
+            .map((j) => j.ins_co_nm)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Ins. Co.*",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.ins_co_nm),
     },
     {
       title: t("appointments.fields.alt_transport"),
       dataIndex: "alt_transport",
       key: "alt_transport",
       ellipsis: true,
-      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+      sortOrder:
+        state.sortedInfo.columnKey === "alt_transport" &&
+        state.sortedInfo.order,
+      filters:
+        (data.scheduled_out_today &&
+          data.scheduled_out_today
+            .map((j) => j.alt_transport)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Alt. Transport*",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
     },
   ];
 
-  const handleTableChange = (sorter) => {
-    setState({ ...state, sortedInfo: sorter });
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
   return (
     <Card
-      title={t("dashboard.titles.scheduledouttoday", {
+      title={t("dashboard.titles.scheduledoutdate", {
         date: moment().startOf("day").format("MM/DD/YYYY"),
       })}
+      extra={
+        <Space>
+          <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
+          <Switch
+            onClick={() => setIsTvModeScheduledOut(!isTvModeScheduledOut)}
+            defaultChecked={isTvModeScheduledOut}
+          />
+        </Space>
+      }
       {...cardProps}
     >
       <div style={{ height: "100%" }}>
         <Table
           onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: pageLimit }}
-          columns={columns}
+          pagination={false}
+          columns={isTvModeScheduledOut ? tvColumns : columns}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
           dataSource={data.scheduled_out_today}
+          size={isTvModeScheduledOut ? "small" : "middle"}
         />
       </div>
     </Card>
@@ -188,6 +465,10 @@ 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
@@ -200,6 +481,7 @@ 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,386 +1,391 @@
-import Icon, { SyncOutlined } from "@ant-design/icons";
-import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, Menu, PageHeader, Space, notification } from "antd";
+import Icon, {SyncOutlined} from "@ant-design/icons";
+import {gql, useMutation, useQuery} from "@apollo/client";
+import {Button, Dropdown, Menu, notification, PageHeader, Space} 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: [] }),
-  });
-
-  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 },
-      },
+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: []}),
     });
-    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 items = _.cloneDeep(state.items);
+    const {loading, error, data, refetch} = useQuery(
+        createDashboardQuery(state),
+        {fetchPolicy: "network-only", nextFetchPolicy: "network-only"}
+    );
 
-    items.splice(idxToRemove, 1);
-    setState({ ...state, items });
-  };
+    const [updateLayout] = useMutation(UPDATE_DASHBOARD_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,
-        },
-      ],
-    });
-  };
+    const handleLayoutChange = async (layout, layouts) => {
+        logImEXEvent("dashboard_change_layout");
 
-  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>
-  );
+        setState({...state, layout, layouts});
 
-  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 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);
 
-      <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,
-              }}
+        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}
             >
-              <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>
-  );
+                {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>
+    );
 }
 
 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,
-  },
-  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,
-  },
+    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,
+    },
 };
 
 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: 80%;
+    height: calc(100% - 2rem);
     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,7 +138,6 @@ class ErrorBoundary extends React.Component {
   }
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(withTranslation()(ErrorBoundary));
+export default Sentry.withErrorBoundary(
+  connect(mapStateToProps, mapDispatchToProps)(withTranslation()(ErrorBoundary))
+);

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

@@ -3,16 +3,13 @@ import axios from "axios";
 import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link, useHistory } from "react-router-dom";
+import { Link } from "react-router-dom";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 
 export default function GlobalSearchOs() {
   const { t } = useTranslation();
-  const history = useHistory();
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState(false);
 
@@ -21,7 +18,7 @@ export default function GlobalSearchOs() {
       try {
         setLoading(true);
         const searchData = await axios.post("/search", {
-          search: v,
+          search: v
         });
 
         const resultsByType = {
@@ -29,7 +26,7 @@ export default function GlobalSearchOs() {
           jobs: [],
           bills: [],
           owners: [],
-          vehicles: [],
+          vehicles: []
         };
 
         searchData.data.hits.hits.forEach((hit) => {
@@ -50,16 +47,14 @@ export default function GlobalSearchOs() {
                       <span>
                         <OwnerNameDisplay ownerObject={job} />
                       </span>
-                      <span>{`${job.v_model_yr || ""} ${
-                        job.v_make_desc || ""
-                      } ${job.v_model_desc || ""}`}</span>
+                      <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
                       <span>{`${job.clm_no || ""}`}</span>
                       <span>{`${job.plate_no || ""}`}</span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.owners")),
@@ -69,53 +64,39 @@ export default function GlobalSearchOs() {
                 value: OwnerNameDisplayFunction(owner),
                 label: (
                   <Link to={`/manage/owners/${owner.id}`}>
-                    <Space
-                      size="small"
-                      split={<Divider type="vertical" />}
-                      wrap
-                    >
+                    <Space size="small" split={<Divider type="vertical" />} wrap>
                       <span>
                         <OwnerNameDisplay ownerObject={owner} />
                       </span>
-                      <PhoneNumberFormatter>
-                        {owner.ownr_ph1}
-                      </PhoneNumberFormatter>
-                      <PhoneNumberFormatter>
-                        {owner.ownr_ph2}
-                      </PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.vehicles")),
             options: resultsByType.vehicles.map((vehicle) => {
               return {
                 key: vehicle.id,
-                value: `${vehicle.v_model_yr || ""} ${
-                  vehicle.v_make_desc || ""
-                } ${vehicle.v_model_desc || ""}`,
+                value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`,
                 label: (
                   <Link to={`/manage/vehicles/${vehicle.id}`}>
                     <Space size="small" split={<Divider type="vertical" />}>
                       <span>
-                        {`${vehicle.v_model_yr || ""} ${
-                          vehicle.v_make_desc || ""
-                        } ${vehicle.v_model_desc || ""}`}
+                        {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`}
                       </span>
                       <span>{vehicle.plate_no || ""}</span>
                       <span>
-                        <VehicleVinDisplay>
-                          {vehicle.v_vin || ""}
-                        </VehicleVinDisplay>
+                        <VehicleVinDisplay>{vehicle.v_vin || ""}</VehicleVinDisplay>
                       </span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.payments")),
@@ -133,9 +114,9 @@ export default function GlobalSearchOs() {
                       <span>{payment.transactionid || ""}</span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.bills")),
@@ -151,10 +132,10 @@ export default function GlobalSearchOs() {
                       <span>{bill.date}</span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
-          },
+            })
+          }
           // {
           //   label: renderTitle(t("menus.header.search.phonebook")),
           //   options: resultsByType.search_phonebook.map((pb) => {
@@ -196,15 +177,7 @@ export default function GlobalSearchOs() {
   };
 
   return (
-    <AutoComplete
-      options={data}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onSelect={(val, opt) => {
-        history.push(opt.label.props.to);
-      }}
-      onClear={() => setData([])}
-    >
+    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
       <Input.Search
         size="large"
         placeholder={t("general.labels.globalsearch")}

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

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

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

@@ -13,7 +13,7 @@ import Icon, {
   FileFilled,
   //GlobalOutlined,
   HomeFilled,
-  ImportOutlined,
+  ImportOutlined, InfoCircleOutlined,
   LineChartOutlined,
   PaperClipOutlined,
   PhoneOutlined,
@@ -26,8 +26,8 @@ import Icon, {
   UserOutlined,
 } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Layout, Menu } from "antd";
-import React from "react";
+import {Layout, Menu, Switch, Tooltip} from "antd";
+import React, {useEffect, useState} from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import {
@@ -52,6 +52,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import {handleBeta, setBeta, checkBeta} from "../../utils/handleBeta";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -102,9 +103,21 @@ 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
@@ -431,6 +444,17 @@ 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,6 +53,7 @@ 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobChecklistForm({
@@ -183,6 +183,7 @@ 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,21 +7,31 @@ 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 }) {
+export function JobCreateIOU({
+  bodyshop,
+  currentUser,
+  job,
+  selectedJobLines,
+  technician,
+}) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
@@ -79,13 +89,19 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
       title={t("jobs.labels.createiouwarning")}
       onConfirm={handleCreateIou}
       disabled={
-        !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+        !selectedJobLines ||
+        selectedJobLines.length === 0 ||
+        !job.converted ||
+        technician
       }
     >
       <Button
         loading={loading}
         disabled={
-          !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+          !selectedJobLines ||
+          selectedJobLines.length === 0 ||
+          !job.converted ||
+          technician
         }
       >
         {t("jobs.actions.createiou")}

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

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

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

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

client/src/components/job-detail-lines/job-lines-expander.component.jsx

@@ -1,14 +1,26 @@
 import { useQuery } from "@apollo/client";
-import { Col, Divider, Row, Skeleton, Space, Timeline, Typography } from "antd";
+import { Col, Row, Skeleton, Timeline, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors.js";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
+import BillDetailEditcontainer from "../bill-detail-edit/bill-detail-edit.container.jsx";
 
-export default function JobLinesExpander({ jobline, jobid }) {
+const mapStateToProps = createStructuredSelector({
+  technician: selectTechnician,
+});
+
+const mapDispatchToProps = (dispatch) => ({});
+
+export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);
+
+export function JobLinesExpander({ jobline, jobid, technician }) {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
     fetchPolicy: "network-only",
@@ -31,15 +43,31 @@ export default function JobLinesExpander({ jobline, jobid }) {
           {data.parts_order_lines.length > 0 ? (
             data.parts_order_lines.map((line) => (
               <Timeline.Item key={line.id}>
-                <Space split={<Divider type="vertical" />} wrap>
-                  <Link
-                    to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}
-                  >
-                    {line.parts_order.order_number}
-                  </Link>
-                  <DateFormatter>{line.parts_order.order_date}</DateFormatter>
-                  {line.parts_order.vendor.name}
-                </Space>
+                <Row wrap>
+                  <Col span={4}>
+                    {!technician ? (
+                      <Link
+                        to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}
+                      >
+                        {line.parts_order.order_number}
+                      </Link>
+                    ) : (
+                      `${line.parts_order.order_number}`
+                    )}
+                  </Col>
+                  <Col span={4}>
+                    <DateFormatter>{line.parts_order.order_date}</DateFormatter>
+                  </Col>
+                  <Col span={4}>{line.parts_order.vendor.name}</Col>
+                  {line.backordered_eta ? (
+                    <Col span={4}>
+                      <span>
+                        {`${t("parts_orders.fields.backordered_eta")}: `}
+                        <DateFormatter>{line.backordered_eta}</DateFormatter>
+                      </span>
+                    </Col>
+                  ) : null}
+                </Row>
               </Timeline.Item>
             ))
           ) : (
@@ -51,17 +79,22 @@ export default function JobLinesExpander({ jobline, jobid }) {
       </Col>
       <Col md={24} lg={12}>
         <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
+        <BillDetailEditcontainer />
         <Timeline>
           {data.billlines.length > 0 ? (
             data.billlines.map((line) => (
               <Timeline.Item key={line.id}>
                 <Row wrap>
                   <Col span={4}>
-                    <Link
-                      to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}
-                    >
-                      {line.bill.invoice_number}
-                    </Link>
+                    {!technician ? (
+                      <Link
+                        to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}
+                      >
+                        {line.bill.invoice_number}
+                      </Link>
+                    ) : (
+                      `${line.bill.invoice_number}`
+                    )}
                   </Col>
                   <Col span={4}>
                     <span>
@@ -71,7 +104,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
                   </Col>
                   <Col span={4}>
                     <span>
-                    {`${t("billlines.fields.actual_cost")}: `}
+                      {`${t("billlines.fields.actual_cost")}: `}
                       <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
                     </span>
                   </Col>
@@ -83,9 +116,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
               </Timeline.Item>
             ))
           ) : (
-            <Timeline.Item>
-              {t("parts_orders.labels.notyetordered")}
-            </Timeline.Item>
+            <Timeline.Item>{t("bills.labels.nobilllines")}</Timeline.Item>
           )}
         </Timeline>
       </Col>

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -1,12 +1,12 @@
 import {
   DeleteFilled,
+  EditFilled,
   FilterFilled,
+  HomeOutlined,
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
   SyncOutlined,
   WarningFilled,
-  EditFilled,
-  PlusCircleTwoTone,
-  MinusCircleTwoTone,
-  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import {
@@ -20,6 +20,8 @@ import {
   Tag,
 } from "antd";
 import axios from "axios";
+import _ from "lodash";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -28,23 +30,19 @@ import { DELETE_JOB_LINE_BY_PK } from "../../graphql/jobs-lines.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { onlyUnique } from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
+import JobCreateIOU from "../job-create-iou/job-create-iou.component";
+import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
 import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component";
 import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
 import JobLineStatusPopup from "../job-line-status-popup/job-line-status-popup.component";
 import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-reference.component";
-// import AllocationsAssignmentContainer from "../allocations-assignment/allocations-assignment.container";
-// import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
-// import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
+import PartsOrderDrawer from "../parts-order-list-table/parts-order-list-table-drawer.component";
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
-import _ from "lodash";
-import JobCreateIOU from "../job-create-iou/job-create-iou.component";
 import JobLinesExpander from "./job-lines-expander.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import moment from "moment";
-import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -57,6 +55,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "jobLineEdit" })),
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  setPartsReceiveContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "partsReceive" })),
   setBillEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "billEnter" })),
 });
@@ -66,6 +66,7 @@ export function JobLinesComponent({
   jobRO,
   technician,
   setPartsOrderContext,
+  setPartsReceiveContext,
   loading,
   refetch,
   jobLines,
@@ -74,6 +75,8 @@ export function JobLinesComponent({
   setJobLineEditContext,
   form,
   setBillEnterContext,
+  billsQuery,
+  handlePartsOrderOnRowClick,
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
 
@@ -341,7 +344,7 @@ export function JobLinesComponent({
       key: "actions",
       render: (text, record) => (
         <Space>
-          {(record.manual_line || jobIsPrivate) && (
+          {(record.manual_line || jobIsPrivate) && !technician && (
             <>
               <Button
                 disabled={jobRO}
@@ -424,6 +427,14 @@ export function JobLinesComponent({
   return (
     <div>
       <PartsOrderModalContainer />
+      {!technician && (
+        <PartsOrderDrawer
+          job={job}
+          billsQuery={billsQuery}
+          handleOnRowClick={handlePartsOrderOnRowClick}
+          setPartsReceiveContext={setPartsReceiveContext}
+        />
+      )}
       <PageHeader
         title={t("jobs.labels.estimatelines")}
         extra={

client/src/components/job-detail-lines/job-lines.container.jsx

@@ -1,6 +1,15 @@
 import React, { useMemo, useState } from "react";
 import JobLinesComponent from "./job-lines.component";
-function JobLinesContainer({ job, joblines, refetch, form, ...rest }) {
+function JobLinesContainer({
+  job,
+  joblines,
+  billsQuery,
+  handleBillOnRowClick,
+  handlePartsOrderOnRowClick,
+  refetch,
+  form,
+  ...rest
+}) {
   const [searchText, setSearchText] = useState("");
 
   const jobLines = useMemo(() => {
@@ -37,6 +46,9 @@ function JobLinesContainer({ job, joblines, refetch, form, ...rest }) {
     <JobLinesComponent
       refetch={refetch}
       jobLines={jobLines}
+      billsQuery={billsQuery}
+      handleBillOnRowClick={handleBillOnRowClick}
+      handlePartsOrderOnRowClick={handlePartsOrderOnRowClick}
       setSearchText={setSearchText}
       job={job}
       form={form}

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

@@ -23,7 +23,6 @@ export function JobEmployeeAssignments({
   jobRO,
   body,
   refinish,
-
   prep,
   csr,
   handleAdd,
@@ -78,7 +77,7 @@ export function JobEmployeeAssignments({
               setVisibility(false);
             }}
           >
-            Assign
+            {t("allocations.actions.assign")}
           </Button>
           <Button onClick={() => setVisibility(false)}>Close</Button>
         </Space>

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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -43,12 +43,13 @@ export function JobEmployeeAssignmentsContainer({
     });
     if (refetch) refetch();
 
-    insertAuditTrail({
-      jobid: job.id,
-      operation: AuditTrailMapping.jobassignmentchange(operation, name),
-    });
-
-    if (!!result.errors) {
+    if (!!!result.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobassignmentchange(operation, name),
+        type: "jobassignmentchange",
+      });
+    } else {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
@@ -66,17 +67,19 @@ export function JobEmployeeAssignmentsContainer({
       variables: { jobId: job.id, job: { [empAssignment]: null } },
     });
 
-    if (!!result.errors) {
+    if (!!!result.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobassignmentremoved(operation),
+        type: "jobassignmentremoved",
+      });
+    } else {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
         }),
       });
     }
-    insertAuditTrail({
-      jobid: job.id,
-      operation: AuditTrailMapping.jobassignmentremoved(operation),
-    });
     setLoading(false);
   };
 

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

@@ -0,0 +1,246 @@
+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

@@ -23,14 +23,18 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  technician: selectTechnician,
 });
+
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
+
 export default connect(
   mapStateToProps,
   mapDispatchToProps
@@ -41,6 +45,7 @@ export function JobLineConvertToLabor({
   jobline,
   job,
   insertAuditTrail,
+  technician,
   ...otherBtnProps
 }) {
   const { t } = useTranslation();
@@ -113,6 +118,7 @@ export function JobLineConvertToLabor({
         hours: calculateAdjustment({ mod_lbr_ty, job, jobline }).toFixed(1),
         mod_lbr_ty,
       }),
+      type: "jobmodifylbradj",
     });
     setLoading(false);
     setVisibility(false);
@@ -221,7 +227,7 @@ export function JobLineConvertToLabor({
   return (
     <>
       {children}
-      {jobline.act_price !== 0 && (
+      {jobline.act_price !== 0 && !technician && (
         <Popover
           disabled={jobline.convertedtolbr}
           content={overlay}

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 disabled checked={record.bill.is_credit_memo} />
+        <Checkbox 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, { useState, useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
@@ -50,6 +50,7 @@ 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;
@@ -177,7 +178,7 @@ export default function ScoreboardAddButton({
           return acc + job.lbr_adjustments[val];
         }, 0);
     form.setFieldsValue({
-      date: new moment(),
+      date: 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
 
@@ -32,6 +32,7 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.admin_jobstatuschange(status),
+          type: "admin_jobstatuschange",
         });
         // refetch();
       })
@@ -53,12 +54,14 @@ 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -57,6 +57,7 @@ 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,34 +1,18 @@
 import { useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
-import { gql } from "@apollo/client";
+import { Button, Space, notification } from "antd";
 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 [DELETE_DELIVERY] = useMutation(gql`
-    mutation DELETE_DELIVERY($jobId: uuid!) {
-      update_jobs_by_pk(
-        pk_columns: { id: $jobId }
-        _set: { deliverchecklist: null }
-      ) {
-        id
-        deliverchecklist
-      }
-    }
-  `);
+  const [deleteIntake] = useMutation(DELETE_INTAKE_CHECKLIST);
+  const [deleteDelivery] = useMutation(DELETE_DELIVERY_CHECKLIST);
 
   const handleDelete = async (values) => {
     setLoading(true);
@@ -50,7 +34,7 @@ export default function JobAdminDeleteIntake({ job }) {
 
   const handleDeleteDelivery = async (values) => {
     setLoading(true);
-    const result = await DELETE_DELIVERY({
+    const result = await deleteDelivery({
       variables: { jobId: job.id },
     });
 
@@ -68,12 +52,22 @@ export default function JobAdminDeleteIntake({ job }) {
 
   return (
     <>
-      <Button loading={loading} onClick={handleDelete}>
-        {t("jobs.labels.deleteintake")}
-      </Button>
-      <Button loading={loading} onClick={handleDeleteDelivery}>
-        {t("jobs.labels.deletedelivery")}
-      </Button>
+      <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>
     </>
   );
 }

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

@@ -1,5 +1,5 @@
-import { gql, useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
+import { useMutation } from "@apollo/client";
+import { Button, Space, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -7,6 +7,11 @@ 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,
@@ -18,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -35,58 +40,18 @@ 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 [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 [markJobForReexport] = useMutation(MARK_JOB_FOR_REEXPORT);
+  const [markJobExported] = useMutation(MARK_JOB_AS_EXPORTED);
+  const [markJobUninvoiced] = useMutation(MARK_JOB_AS_UNINVOICED);
 
   const handleMarkForExport = async () => {
     setLoading(true);
     const result = await markJobForReexport({
-      variables: { jobId: job.id },
+      variables: {
+        jobId: job.id,
+        default_invoiced: bodyshop.md_ro_statuses.default_invoiced,
+      },
     });
 
     if (!result.errors) {
@@ -94,6 +59,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkforreexport(),
+        type: "admin_jobmarkforreexport",
       });
     } else {
       notification["error"]({
@@ -108,7 +74,11 @@ export function JobAdminMarkReexport({
   const handleMarkExported = async () => {
     setLoading(true);
     const result = await markJobExported({
-      variables: { jobId: job.id, date_exported: moment() },
+      variables: {
+        jobId: job.id,
+        date_exported: moment(),
+        default_exported: bodyshop.md_ro_statuses.default_exported,
+      },
     });
 
     await insertExportLog({
@@ -130,6 +100,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkexported(),
+        type: "admin_jobmarkexported",
       });
     } else {
       notification["error"]({
@@ -144,7 +115,10 @@ export function JobAdminMarkReexport({
   const handleUninvoice = async () => {
     setLoading(true);
     const result = await markJobUninvoiced({
-      variables: { jobId: job.id },
+      variables: {
+        jobId: job.id,
+        default_delivered: bodyshop.md_ro_statuses.default_delivered,
+      },
     });
 
     if (!result.errors) {
@@ -152,6 +126,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobuninvoice(),
+        type: "admin_jobuninvoice",
       });
     } else {
       notification["error"]({
@@ -165,27 +140,29 @@ export function JobAdminMarkReexport({
 
   return (
     <>
-      <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 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>
     </>
   );
 }

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

@@ -0,0 +1,66 @@
+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,9 +1,10 @@
-import { gql, useMutation } from "@apollo/client";
+import { 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,
@@ -16,8 +17,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
@@ -29,66 +30,17 @@ export function JobsAdminUnvoid({
 }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  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 [mutationUnvoidJob] = useMutation(UNVOID_JOB);
 
   const handleUpdate = async (values) => {
     setLoading(true);
-    const result = await updateJob({
-      variables: { jobId: job.id },
+    const result = await mutationUnvoidJob({
+      variables: {
+        jobId: job.id,
+        default_imported: bodyshop.md_ro_statuses.default_imported,
+        currentUserEmail: currentUser.email,
+        text: t("jobs.labels.unvoidnote"),
+      },
     });
 
     if (!result.errors) {
@@ -97,6 +49,7 @@ mutation UNVOID_JOB($jobId: uuid!) {
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobunvoid(),
+        type: "admin_jobunvoid",
       });
     } else {
       notification["error"]({
@@ -110,8 +63,10 @@ mutation UNVOID_JOB($jobId: uuid!) {
   };
 
   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, notification, Row } from "antd";
+import { Col, Row, notification } from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
-import moment from "moment";
+import moment from "moment-business-days";
 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 confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import confirmDialog from "../../utils/asyncConfirm";
 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export function JobsAvailableContainer({
   bodyshop,
@@ -73,7 +73,15 @@ 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 [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 [insertLoading, setInsertLoading] = useState(false);
 
@@ -182,6 +190,7 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: r.data.insert_jobs.returning[0].id,
         operation: AuditTrailMapping.jobimported(),
+        type: "jobimported",
       });
 
       deleteJob({
@@ -197,11 +206,16 @@ 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
@@ -225,6 +239,22 @@ 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;
@@ -261,9 +291,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) {
@@ -321,6 +351,7 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: selectedJob,
         operation: AuditTrailMapping.jobsupplement(),
+        type: "jobsupplement",
       });
     }
   };
@@ -367,7 +398,6 @@ export function JobsAvailableContainer({
 
   if (error) return <AlertComponent type="error" message={error.message} />;
 
-
   return (
     <LoadingSpinner
       loading={insertLoading}
@@ -384,7 +414,6 @@ export function JobsAvailableContainer({
         visible={ownerModalVisible}
         onOk={onOwnerFindModalOk}
         onCancel={onOwnerModalCancel}
-
       />
       <JobsFindModalContainer
         loading={estDataRaw.loading}
@@ -398,6 +427,8 @@ 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
@@ -35,6 +35,7 @@ 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,10 +9,12 @@ 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({
@@ -20,6 +22,11 @@ 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",
@@ -40,6 +47,7 @@ export function JobsCloseExportButton({
   disabled,
   setSelectedJobs,
   refetch,
+  insertAuditTrail,
 }) {
   const history = useHistory();
   const { t } = useTranslation();
@@ -181,6 +189,11 @@ 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)
           );
@@ -192,12 +205,21 @@ 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(
@@ -227,4 +249,7 @@ export function JobsCloseExportButton({
   );
 }
 
-export default connect(mapStateToProps, null)(JobsCloseExportButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsConvertButton({
@@ -78,6 +78,7 @@ export function JobsConvertButton({
         operation: AuditTrailMapping.jobconverted(
           res.data.update_jobs.returning[0].ro_number
         ),
+        type: "jobconverted",
       });
 
       setVisible(false);

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

@@ -1,4 +1,12 @@
-import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd";
+import {
+  Collapse,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,6 +18,8 @@ import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
+import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
+import JobsDetailChangeFilehandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
 import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
 import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
@@ -25,6 +35,15 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
   const { t } = useTranslation();
   const { getFieldValue } = form;
+
+  const handleInsCoChange = (value) => {
+    const selectedCompany = bodyshop.md_ins_cos.find((s) => s.name === value);
+    if (selectedCompany) {
+      form.setFieldValue("ins_addr1", selectedCompany.street1);
+      form.setFieldValue("ins_city", selectedCompany.city);
+    }
+  };
+
   return (
     <div>
       <Collapse defaultActiveKey="insurance">
@@ -34,26 +53,20 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           forceRender
         >
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.ins_co_id")} name="ins_co_id">
+            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
-              <Input />
-            </Form.Item>
             <Form.Item
               label={t("jobs.fields.regie_number")}
               name="regie_number"
             >
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
-              <FormDatePicker />
-            </Form.Item>
             <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-              <Select>
+              <Select onChange={handleInsCoChange}>
                 {bodyshop.md_ins_cos.map((s) => (
                   <Select.Option key={s.name} value={s.name}>
                     {s.name}
@@ -67,7 +80,15 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             <Form.Item label={t("jobs.fields.ins_city")} name="ins_city">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_ct_ln")} name="ins_ct_ln">
+            <Form.Item
+              label={
+                <Space>
+                  {t("jobs.fields.ins_ct_ln")}
+                  <JobsDetailChangeFilehandler form={form} />
+                </Space>
+              }
+              name="ins_ct_ln"
+            >
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn">
@@ -95,11 +116,24 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <FormItemEmail email={getFieldValue("ins_ea")} />
             </Form.Item>
-
+            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
+              <FormDatePicker />
+            </Form.Item>
+            <Form.Item label={t("jobs.fields.kmin")} name="kmin">
+              <Input />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.est_ct_fn")} name="est_ct_fn">
+            <Form.Item
+              label={
+                <Space>
+                  {t("jobs.fields.est_ct_fn")}
+                  <JobsDetailChangeEstimator form={form} />
+                </Space>
+              }
+              name="est_ct_fn"
+            >
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.est_ct_ln")} name="est_ct_ln">

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

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

@@ -37,6 +37,15 @@ const lossColDamage = { sm: { span: 24 }, md: { span: 6 }, lg: { span: 4 } };
 export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
   const { getFieldValue } = form;
   const { t } = useTranslation();
+
+  const handleInsCoChange = (value) => {
+    const selectedCompany = bodyshop.md_ins_cos.find((s) => s.name === value);
+    if (selectedCompany) {
+      form.setFieldValue("ins_addr1", selectedCompany.street1);
+      form.setFieldValue("ins_city", selectedCompany.city);
+    }
+  };
+
   return (
     <div>
       <FormRow header={t("jobs.forms.claiminfo")}>
@@ -71,7 +80,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-          <Select disabled={jobRO}>
+          <Select disabled={jobRO} onChange={handleInsCoChange}>
             {bodyshop.md_ins_cos.map((s) => (
               <Select.Option key={s.name} value={s.name}>
                 {s.name}

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

@@ -29,6 +29,7 @@ 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsDetailHeaderActions({
@@ -115,6 +115,7 @@ export function JobsDetailHeaderActions({
           ? !job.production_vars.alert
           : true
       ),
+      type: "alertToggle",
     });
   };
 
@@ -129,6 +130,13 @@ export function JobsDetailHeaderActions({
         },
       },
     });
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobsuspend(
+        !!job.suspended ? !job.suspended : true
+      ),
+      type: "jobsuspend",
+    });
   };
 
   const statusmenu = (
@@ -184,6 +192,7 @@ export function JobsDetailHeaderActions({
                       jobid: job.id,
                       operation:
                         AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                      type: "appointmentcancel",
                     });
                     return;
                   }
@@ -295,7 +304,7 @@ export function JobsDetailHeaderActions({
         disabled={!job.converted}
         onClick={() => {
           setCardPaymentContext({
-            actions: {},
+            actions: { refetch },
             context: { jobid: job.id },
           });
         }}
@@ -540,6 +549,11 @@ 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

@@ -4,7 +4,8 @@ import {
   PauseCircleOutlined,
   WarningFilled,
 } from "@ant-design/icons";
-import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
+import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -15,6 +16,7 @@ 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";
@@ -61,6 +63,13 @@ 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 (
@@ -92,7 +101,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                 job.scheduled_in ? (
                   <Tag>
-                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                    <Link
+                      to={`/manage/schedule?date=${moment(
+                        job.scheduled_in
+                      ).format("YYYY-MM-DD")}`}
+                    >
+                      <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                    </Link>
                   </Tag>
                 ) : null}
               </Space>
@@ -122,20 +137,23 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             </DataLabel>
             {job.cccontracts.length > 0 && (
               <DataLabel label={t("jobs.labels.contracts")}>
-                {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>
+                {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>
                 ))}
               </DataLabel>
             )}
-
             <DataLabel label={t("jobs.fields.production_vars.note")}>
               <ProductionListColumnProductionNote record={job} />
             </DataLabel>
-
-            <Space>
+            <Space wrap>
               {job.special_coverage_policy && (
                 <Tag color="tomato">
                   <Space>
@@ -160,19 +178,35 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
         <Card
           style={{ height: "100%" }}
           title={
-            <Link to={disabled ? "#" : `/manage/owners/${job.owner.id}`}>
-              {ownerTitle.length > 0
-                ? ownerTitle
-                : t("owner.labels.noownerinfo")}
-            </Link>
+            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>
+            )
           }
         >
           <div>
             <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
-              <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
+              {disabled ? (
+                <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
+              ) : (
+                <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
+              )}
             </DataLabel>
             <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
-              <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+              {disabled ? (
+                <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
+              ) : (
+                <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+              )}
             </DataLabel>
             <DataLabel key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -180,13 +214,23 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
             </DataLabel>
             <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
-              {job.ownr_ea || ""}
+              {disabled ? (
+                <>{job.ownr_ea || ""}</>
+              ) : job.ownr_ea ? (
+                <a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
+              ) : null}
             </DataLabel>
             {job.owner?.tax_number && (
               <DataLabel key="5" label={t("owners.fields.tax_number")}>
                 {job.owner?.tax_number || ""}
               </DataLabel>
             )}
+            <DataLabel
+              label={t("owners.fields.note")}
+              valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
+            >
+              {job.owner?.note || ""}
+            </DataLabel>
           </div>
         </Card>
       </Col>
@@ -195,17 +239,19 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
           style={{ height: "100%" }}
           title={
             job.vehicle ? (
-              <Link
-                to={
-                  disabled
-                    ? "#"
-                    : job.vehicle && `/manage/vehicles/${job.vehicle.id}`
-                }
-              >
-                {vehicleTitle.length > 0
-                  ? vehicleTitle
-                  : t("vehicles.labels.novehinfo")}
-              </Link>
+              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>
+              )
             ) : (
               <span></span>
             )
@@ -221,12 +267,19 @@ 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} />
+              <JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
             </DataLabel>
             {job.vehicle && job.vehicle.notes && (
               <DataLabel
@@ -266,6 +319,11 @@ 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-detail-pli/jobs-detail-pli.container.jsx

@@ -1,44 +1,12 @@
-import { useQuery } from "@apollo/client";
-import queryString from "query-string";
 import React from "react";
-import { useHistory, useLocation } from "react-router-dom";
-import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
 import JobsDetailPliComponent from "./jobs-detail-pli.component";
 
-export default function JobsDetailPliContainer({ job }) {
-  const billsQuery = useQuery(QUERY_BILLS_BY_JOBID, {
-    variables: { jobid: job.id },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
-
-  const search = queryString.parse(useLocation().search);
-  const history = useHistory();
-
-  const handleBillOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        search.billid = record.id;
-        history.push({ search: queryString.stringify(search) });
-      }
-    } else {
-      delete search.billid;
-      history.push({ search: queryString.stringify(search) });
-    }
-  };
-
-  const handlePartsOrderOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        search.partsorderid = record.id;
-        history.push({ search: queryString.stringify(search) });
-      }
-    } else {
-      delete search.partsorderid;
-      history.push({ search: queryString.stringify(search) });
-    }
-  };
-
+export default function JobsDetailPliContainer({
+  job,
+  billsQuery,
+  handleBillOnRowClick,
+  handlePartsOrderOnRowClick,
+}) {
   return (
     <JobsDetailPliComponent
       job={job}

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

@@ -9,10 +9,12 @@ 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({
@@ -20,6 +22,11 @@ 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",
@@ -41,6 +48,7 @@ export function JobsExportAllButton({
   loadingCallback,
   completedCallback,
   refetch,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOBS);
@@ -177,6 +185,13 @@ 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
@@ -190,13 +205,17 @@ 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"),
             });
-            updateJobCache([
+            const successfulTransactionsSet = [
               ...new Set(
                 successfulTransactions.map(
                   (st) =>
@@ -207,7 +226,15 @@ export function JobsExportAllButton({
                     ]
                 )
               ),
-            ]);
+            ];
+            if (successfulTransactionsSet.length > 0) {
+              insertAuditTrail({
+                jobid: successfulTransactionsSet[0],
+                operation: AuditTrailMapping.jobexported(),
+                type: "jobexported",
+              });
+            }
+            updateJobCache(successfulTransactionsSet);
           }
         }
       })
@@ -225,4 +252,7 @@ export function JobsExportAllButton({
   );
 }
 
-export default connect(mapStateToProps, null)(JobsExportAllButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsExportAllButton);

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

@@ -1,9 +1,11 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Checkbox, Divider, Input, Table, Button } from "antd";
-import React from "react";
+import { Button, Checkbox, Divider, Input, Space, Table } from "antd";
+import moment from "moment";
+import React, { useState } 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({
@@ -16,11 +18,13 @@ 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"),
@@ -142,6 +146,35 @@ 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;
       }
     }
@@ -177,6 +210,35 @@ 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],
@@ -190,23 +252,58 @@ export default function JobsFindModalComponent({
         }}
       />
       <Divider />
-      <Checkbox
-        defaultChecked={importOptions.overrideHeader}
-        onChange={(e) =>
-          setImportOptions({
-            ...importOptions,
-            overrideHeaders: e.target.checked,
-          })
-        }
-      >
-        {t("jobs.labels.override_header")}
-      </Checkbox>
-      <Checkbox
+      <Space>
+        <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>
+        >
+          {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>
     </div>
   );
 }

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

@@ -26,6 +26,8 @@ export default connect(
   modalSearchState,
   partsQueueToggle,
   setPartsQueueToggle,
+  updateSchComp,
+  setSchComp,
   ...modalProps
 }) {
   const { t } = useTranslation();
@@ -95,6 +97,8 @@ 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,9 +10,11 @@ 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 { alphaSort, statusSort } from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -25,6 +27,7 @@ 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();
 
@@ -34,7 +37,10 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
+      sorter: search?.search
+        ? (a, b) =>
+            parseInt((a.ro_number || "0").replace(/\D/g, "")) - parseInt((b.ro_number || "0").replace(/\D/g, ""))
+        : true,
       sortOrder: sortcolumn === "ro_number" && sortorder,
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.id}>
@@ -48,7 +54,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       key: "ownr_ln",
       ellipsis: true,
       //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-
       //sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
         return record.ownerid ? (
@@ -66,7 +71,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-
       ellipsis: true,
       render: (text, record) => (
         <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
@@ -76,7 +80,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-
       ellipsis: true,
       render: (text, record) => (
         <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
@@ -86,13 +89,13 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-
       ellipsis: true,
-      sorter: true, // (a, b) => alphaSort(a.status, b.status),
+      sorter: search?.search ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses) : true,
       sortOrder: sortcolumn === "status" && sortorder,
       render: (text, record) => {
         return record.status || t("general.labels.na");
       },
+      filteredValue: filter?.status || null,
       filters: bodyshop.md_ro_statuses.statuses.map((s) => {
         return { text: s, value: [s] };
       }),
@@ -103,7 +106,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicle",
       key: "vehicle",
-
       ellipsis: true,
       render: (text, record) => {
         return record.vehicleid ? (
@@ -124,7 +126,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "plate_no",
       key: "plate_no",
       ellipsis: true,
-      sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
+      sorter: search?.search ? (a, b) => alphaSort(a.plate_no, b.plate_no) : true,
       sortOrder: sortcolumn === "plate_no" && sortorder,
       render: (text, record) => {
         return record.plate_no ? record.plate_no : "";
@@ -135,7 +137,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "clm_no",
       key: "clm_no",
       ellipsis: true,
-      sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
+      sorter: search?.search ? (a, b) => alphaSort(a.clm_no, b.clm_no) : true,
       sortOrder: sortcolumn === "clm_no" && sortorder,
       render: (text, record) =>
         `${record.clm_no || ""}${
@@ -153,7 +155,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "clm_total",
       key: "clm_total",
 
-      sorter: true, //(a, b) => a.clm_total - b.clm_total,
+      sorter: search?.search ? (a, b) => a.clm_total - b.clm_total : true,
       sortOrder: sortcolumn === "clm_total" && sortorder,
       render: (text, record) => {
         return record.clm_total ? (
@@ -167,7 +169,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.owner_owing"),
       dataIndex: "owner_owing",
       key: "owner_owing",
-
       render: (text, record) => (
         <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
       ),
@@ -189,6 +190,7 @@ 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,8 +1,8 @@
 import {
-    SyncOutlined,
-    ExclamationCircleFilled,
-    PauseCircleOutlined,
-    BranchesOutlined,
+  BranchesOutlined,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+  SyncOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -14,382 +14,411 @@ 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 { onlyUnique } from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+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";
 
 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 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 [state, setState] = useState({
-        sortedInfo: {},
-        filteredInfo: { text: "" },
-    });
+  const [state, setState] = useState({ sortedInfo: {} });
+  const [filter, setFilter] = useLocalStorage("filter_jobs_list", null);
 
-    const { t } = useTranslation();
-    const history = useHistory();
-    const [searchText, setSearchText] = useState("");
+  const { t } = useTranslation();
+  const history = useHistory();
+  const [searchText, setSearchText] = useState("");
 
-    if (error) return <AlertComponent message={error.message} type="error" />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
 
-    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 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 handleTableChange = (pagination, filters, sorter) => {
-        setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-    };
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, sortedInfo: sorter });
+    setFilter(filters);
+  };
 
-    const handleOnRowClick = (record) => {
-        if (record) {
-            if (record.id) {
-                history.push({
-                    search: queryString.stringify({
-                        ...searchParams,
-                        selected: record.id,
-                    }),
-                });
-            }
-        }
-    };
+  const handleOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        history.push({
+          search: queryString.stringify({
+            ...searchParams,
+            selected: record.id,
+          }),
+        });
+      }
+    }
+  };
 
-    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(a.ownr_ln, b.ownr_ln),
-            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>
+  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} />
           </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);
             },
-        },
-        {
-            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) => alphaSort(a.status, b.status),
-            sortOrder:
-                state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-            filters:
-                (jobs &&
-                    jobs
-                        .map((j) => j.status)
-                        .filter(onlyUnique)
-                        .map((s) => {
-                            return {
-                                text: s || "No Status*",
-                                value: [s],
-                            };
-                        })) ||
-                [],
-            onFilter: (value, record) => value.includes(record.status),
-        },
-
-        {
-            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: (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,
-            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: (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: "jobs.labels.estimator",
-            ellipsis: true,
-            responsive: ["xl"],
-            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>
-                    <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>
-    );
+          };
+        }}
+      />
+    </Card>
+  );
 }
 
 export default connect(mapStateToProps, null)(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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
 
@@ -49,6 +49,7 @@ 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,11 +16,12 @@ 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 { alphaSort } from "../../utils/sorters";
+import { pageLimit } from "../../utils/config";
+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 {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -53,10 +54,8 @@ export function JobsReadyList({ bodyshop }) {
     nextFetchPolicy: "network-only",
   });
 
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" },
-  });
+  const [state, setState] = useState({ sortedInfo: {} });
+  const [filter, setFilter] = useLocalStorage("filter_jobs_ready", null);
 
   const { t } = useTranslation();
   const history = useHistory();
@@ -105,7 +104,8 @@ export function JobsReadyList({ bodyshop }) {
     : [];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    setState({ ...state, sortedInfo: sorter });
+    setFilter(filters);
   };
 
   const handleOnRowClick = (record) => {
@@ -129,7 +129,6 @@ 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}
@@ -157,7 +156,6 @@ export function JobsReadyList({ bodyshop }) {
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-
       responsive: ["md"],
       sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       sortOrder:
@@ -197,16 +195,15 @@ 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
@@ -217,11 +214,17 @@ 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",
@@ -274,6 +277,7 @@ export function JobsReadyList({ bodyshop }) {
       dataIndex: "ins_co_nm",
       key: "ins_co_nm",
       ellipsis: true,
+      filteredValue: filter?.ins_co_nm || null,
       filters:
         (jobs &&
           jobs
@@ -281,10 +285,11 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s,
+                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"],
@@ -295,7 +300,6 @@ 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,
@@ -306,9 +310,10 @@ export function JobsReadyList({ bodyshop }) {
     {
       title: t("jobs.labels.estimator"),
       dataIndex: "jobs.labels.estimator",
-      key: "jobs.labels.estimator",
+      key: "estimator",
       ellipsis: true,
       responsive: ["xl"],
+      filteredValue: filter?.estimator || null,
       filterSearch: true,
       filters:
         (jobs &&
@@ -317,10 +322,11 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "N/A",
+                text: s || "No Estimator*",
                 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 }) {
+export default function JobsRelatedRos({ jobid, job, disabled }) {
   if (!(job && job.vehicle && job.vehicle.jobs)) return null;
   return (
     <Space wrap>
@@ -10,9 +10,15 @@ export default function JobsRelatedRos({ jobid, job }) {
         .filter((j) => j.id !== job.id)
         .map((j) => (
           <Tag key={j.id}>
-            <Link to={`/manage/jobs/${j?.id}`}>{`${j.ro_number || "N/A"}${
-              j.clm_no ? ` | ${j.clm_no}` : ""
-            }${j.status ? ` | ${j.status}` : ""}`}</Link>
+            {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>
+            )}
           </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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -76,6 +76,7 @@ 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function NoteUpsertModalContainer({
@@ -70,6 +70,7 @@ export function NoteUpsertModalContainer({
         insertAuditTrail({
           jobid: context.jobId,
           operation: AuditTrailMapping.jobnoteupdated(),
+          type: "jobnoteupdated",
         });
       });
       if (refetch) refetch();
@@ -102,6 +103,7 @@ export function NoteUpsertModalContainer({
           insertAuditTrail({
             jobid: newJobId,
             operation: AuditTrailMapping.jobnoteadded(),
+            type: "jobnoteadded",
           });
         });
       }
@@ -115,6 +117,7 @@ export function NoteUpsertModalContainer({
       insertAuditTrail({
         jobid: context.jobId,
         operation: AuditTrailMapping.jobnoteadded(),
+        type: "jobnoteadded",
       });
     }
   };

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

@@ -6,7 +6,8 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, statusSort } from "../../utils/sorters";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import OwnerDetailUpdateJobsComponent from "../owner-detail-update-jobs/owner-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -24,7 +25,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,6 +45,15 @@ 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}`}>
@@ -67,11 +77,28 @@ 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),
+    },
+    {
+      title: t("jobs.fields.actual_completion"),
+      dataIndex: "actual_completion",
+      key: "actual_completion",
+      render: (text, record) => (
+        <DateTimeFormatter>{record.actual_completion}</DateTimeFormatter>
+      ),
+      sorter: (a, b) => dateSort(a.actual_completion, b.actual_completion),
+      sortOrder:
+        state.sortedInfo.columnKey === "actual_completion" &&
+        state.sortedInfo.order,
     },
-
     {
       title: t("jobs.fields.clm_total"),
       dataIndex: "clm_total",

client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx

@@ -0,0 +1,416 @@
+import { DeleteFilled } from "@ant-design/icons";
+import { useLazyQuery, useMutation } from "@apollo/client";
+import {
+  Button,
+  Drawer,
+  Grid,
+  PageHeader,
+  Popconfirm,
+  Space,
+  Table,
+} from "antd";
+import queryString from "query-string";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
+import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+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 } from "../../utils/sorters";
+import DataLabel from "../data-label/data-label.component";
+import FeatureWrapperComponent from "../feature-wrapper/feature-wrapper.component";
+import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
+import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
+import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-line.component";
+import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
+import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
+import PrintWrapper from "../print-wrapper/print-wrapper.component";
+
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBillEnterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "billEnter",
+      })
+    ),
+  setPartsReceiveContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "partsReceive",
+      })
+    ),
+});
+
+export function PartsOrderListTableDrawerComponent({
+  setBillEnterContext,
+  bodyshop,
+  jobRO,
+  job,
+  billsQuery,
+  handleOnRowClick,
+  setPartsReceiveContext,
+}) {
+  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: "65%",
+  };
+  const drawerPercentage = selectedBreakpoint
+    ? bpoints[selectedBreakpoint[0]]
+    : "100%";
+  const responsibilityCenters = bodyshop.md_responsibility_centers;
+  const Templates = TemplateList("partsorder", { job });
+
+  const { t } = useTranslation();
+  const [state, setState] = useState({
+    sortedInfo: {},
+  });
+
+  const [billData, setBillData] = useState(null);
+  const search = queryString.parse(useLocation().search);
+  const selectedpartsorder = search.partsorderid;
+
+  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
+  const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
+  const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
+  const { refetch } = billsQuery;
+
+  const selectedPartsOrderRecord = parts_orders.find(
+    (r) => r.id === selectedpartsorder
+  );
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (selectedPartsOrderRecord?.returnfrombill) {
+        try {
+          const { data } = await billQuery({
+            variables: { billid: selectedPartsOrderRecord.returnfrombill },
+          });
+          setBillData(data);
+        } catch (error) {
+          console.error("Error fetching bill data:", error);
+        }
+      } else setBillData(null);
+    };
+    fetchData();
+  }, [selectedPartsOrderRecord, billQuery]);
+
+  const recordActions = (record) => (
+    <Space direction="horizontal" wrap>
+      <Button
+        disabled={
+          jobRO ||
+          record.return ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
+        onClick={() => {
+          logImEXEvent("parts_order_receive_bill");
+          setPartsReceiveContext({
+            actions: { refetch: refetch },
+            context: {
+              jobId: job.id,
+              job: job,
+              partsorderlines: record.parts_order_lines.map((pol) => ({
+                joblineid: pol.job_line_id,
+                id: pol.id,
+                line_desc: pol.line_desc,
+                quantity: pol.quantity,
+                act_price: pol.act_price,
+                oem_partno: pol.oem_partno,
+              })),
+            },
+          });
+        }}
+      >
+        {t("parts_orders.actions.receive")}
+      </Button>
+      <Popconfirm
+        title={t("parts_orders.labels.confirmdelete")}
+        disabled={jobRO}
+        onConfirm={async () => {
+          //Delete the parts return.!
+          await deletePartsOrder({
+            variables: { partsOrderId: record.id },
+            update(cache) {
+              cache.modify({
+                fields: {
+                  parts_orders(existingPartsOrders, { readField }) {
+                    return existingPartsOrders.filter(
+                      (billref) => record.id !== readField("id", billref)
+                    );
+                  },
+                },
+              });
+            },
+          });
+        }}
+      >
+        <Button disabled={jobRO}>
+          <DeleteFilled />
+        </Button>
+      </Popconfirm>
+      <FeatureWrapperComponent featureName="bills" noauth={() => null}>
+        <Button
+          disabled={
+            (jobRO ? !record.return : jobRO) ||
+            record.vendor.id === bodyshop.inhousevendorid
+          }
+          onClick={() => {
+            logImEXEvent("parts_order_receive_bill");
+            setBillEnterContext({
+              actions: { refetch: refetch },
+              context: {
+                job: job,
+                bill: {
+                  vendorid: record.vendor.id,
+                  is_credit_memo: record.return,
+                  billlines: record.parts_order_lines.map((pol) => ({
+                    joblineid: pol.job_line_id || "noline",
+                    line_desc: pol.line_desc,
+                    quantity: pol.quantity,
+                    actual_price: pol.act_price,
+                    cost_center: pol.jobline?.part_type
+                      ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
+                        ? pol.jobline.part_type !== "PAE"
+                          ? pol.jobline.part_type
+                          : null
+                        : responsibilityCenters.defaults &&
+                          (responsibilityCenters.defaults.costs[
+                            pol.jobline.part_type
+                          ] ||
+                            null)
+                      : null,
+                  })),
+                },
+              },
+            });
+          }}
+        >
+          {t("parts_orders.actions.receivebill")}
+        </Button>
+      </FeatureWrapperComponent>
+      <PrintWrapper
+        templateObject={{
+          name: record.return
+            ? Templates.parts_return_slip.key
+            : Templates.parts_order.key,
+          variables: { id: record.id },
+        }}
+        messageObject={{
+          subject: record.return
+            ? Templates.parts_return_slip.subject
+            : Templates.parts_order.subject,
+          to: record.vendor.email,
+        }}
+        id={job.id}
+      />
+    </Space>
+  );
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  const rowExpander = (record) => {
+    const columns = [
+      {
+        title: t("parts_orders.fields.line_desc"),
+        dataIndex: "line_desc",
+        key: "line_desc",
+        sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+        sortOrder:
+          state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
+      },
+      {
+        title: t("parts_orders.fields.quantity"),
+        dataIndex: "quantity",
+        key: "quantity",
+        sorter: (a, b) => a.quantity - b.quantity,
+        sortOrder:
+          state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
+      },
+      {
+        title: t("parts_orders.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,
+        render: (text, record) => (
+          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
+        ),
+      },
+      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
+        ? [
+            {
+              title: t("parts_orders.fields.cost"),
+              dataIndex: "cost",
+              key: "cost",
+              sorter: (a, b) => a.cost - b.cost,
+              sortOrder:
+                state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
+              render: (text, record) => (
+                <CurrencyFormatter>{record.cost}</CurrencyFormatter>
+              ),
+            },
+          ]
+        : []),
+      {
+        title: t("parts_orders.fields.part_type"),
+        dataIndex: "part_type",
+        key: "part_type",
+        render: (text, record) =>
+          record.part_type
+            ? t(`joblines.fields.part_types.${record.part_type}`)
+            : null,
+      },
+      {
+        title: t("parts_orders.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,
+      },
+      {
+        title: t("parts_orders.fields.line_remarks"),
+        dataIndex: "line_remarks",
+        key: "line_remarks",
+      },
+      {
+        title: t("parts_orders.fields.status"),
+        dataIndex: "status",
+        key: "status",
+      },
+
+      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
+        ? [
+            {
+              title: t("parts_orders.fields.cm_received"),
+              dataIndex: "cm_received",
+              key: "cm_received",
+              render: (text, record) => (
+                <PartsOrderCmReceived
+                  orderLineId={record.id}
+                  checked={record.cm_received}
+                  partsorderid={selectedPartsOrderRecord.id}
+                />
+              ),
+            },
+          ]
+        : []),
+      {
+        title: t("parts_orders.fields.backordered_on"),
+        dataIndex: "backordered_on",
+        key: "backordered_on",
+        render: (text, record) => <DateFormatter>{text}</DateFormatter>,
+      },
+      {
+        title: t("parts_orders.fields.backordered_eta"),
+        dataIndex: "backordered_eta",
+        key: "backordered_eta",
+        render: (text, record) => (
+          <PartsOrderBackorderEta
+            backordered_eta={record.backordered_eta}
+            disabled={jobRO}
+            partsOrderStatus={record.status}
+            partsLineId={record.id}
+            jobLineId={record.job_line_id}
+          />
+        ),
+      },
+
+      {
+        title: t("general.labels.actions"),
+        dataIndex: "actions",
+        key: "actions",
+        render: (text, record) => (
+          <Space wrap>
+            <PartsOrderDeleteLine
+              disabled={jobRO}
+              partsOrderStatus={record.status}
+              partsLineId={record.id}
+              partsOrderId={selectedpartsorder}
+              jobLineId={record.job_line_id}
+            />
+            <PartsOrderLineBackorderButton
+              disabled={jobRO}
+              partsOrderStatus={record.status}
+              partsLineId={record.id}
+              jobLineId={record.job_line_id}
+            />
+          </Space>
+        ),
+      },
+    ];
+
+    return (
+      <div>
+        <PageHeader
+          title={
+            billData
+              ? `${record.vendor.name} - ${record.order_number} - ${t(
+                  "bills.labels.returnfrombill"
+                )}: ${billData.bills_by_pk.invoice_number}`
+              : `${record.vendor.name} - ${record.order_number}`
+          }
+          extra={recordActions(record)}
+        />
+        <Table
+          scroll={{
+            x: true, //y: "50rem"
+          }}
+          columns={columns}
+          rowKey="id"
+          dataSource={record.parts_order_lines}
+          onChange={handleTableChange}
+        />
+        <DataLabel label={t("parts_orders.fields.comments")}>
+          <div style={{ whiteSpace: "pre" }}>{record.comments}</div>
+        </DataLabel>
+      </div>
+    );
+  };
+
+  return (
+    <div>
+      <PartsReceiveModalContainer />
+      <Drawer
+        placement="right"
+        onClose={() => handleOnRowClick(null)}
+        open={selectedpartsorder}
+        closable
+        width={drawerPercentage}
+      >
+        {selectedPartsOrderRecord && rowExpander(selectedPartsOrderRecord)}
+      </Drawer>
+    </div>
+  );
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PartsOrderListTableDrawerComponent);

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -1,39 +1,21 @@
 import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import {
-  Button,
-  Card,
-  Checkbox,
-  Drawer,
-  Grid,
-  Input,
-  PageHeader,
-  Popconfirm,
-  Space,
-  Table,
-} from "antd";
-import queryString from "query-string";
+import { Button, Card, Checkbox, Input, Popconfirm, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 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 { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
-import DataLabel from "../data-label/data-label.component";
-import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
-import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
-import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-line.component";
-import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
+import { alphaSort } from "../../utils/sorters";
 import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
 import PrintWrapper from "../print-wrapper/print-wrapper.component";
+import PartsOrderDrawer from "./parts-order-list-table-drawer.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -56,21 +38,6 @@ export function PartsOrderListTableComponent({
   handleOnRowClick,
   setPartsReceiveContext,
 }) {
-  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: "65%",
-  };
-  const drawerPercentage = selectedBreakpoint
-    ? bpoints[selectedBreakpoint[0]]
-    : "100%";
   const responsibilityCenters = bodyshop.md_responsibility_centers;
   const Templates = TemplateList("partsorder", { job });
 
@@ -78,10 +45,8 @@ export function PartsOrderListTableComponent({
   const [state, setState] = useState({
     sortedInfo: {},
   });
-  const search = queryString.parse(useLocation().search);
-  const selectedpartsorder = search.partsorderid;
-  const [searchText, setSearchText] = useState("");
 
+  const [searchText, setSearchText] = useState("");
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
@@ -90,7 +55,11 @@ export function PartsOrderListTableComponent({
   const recordActions = (record, showView = false) => (
     <Space wrap>
       {showView && (
-        <Button onClick={() => handleOnRowClick(record)}>
+        <Button
+          onClick={() => {
+            handleOnRowClick(record);
+          }}
+        >
           <EyeFilled />
         </Button>
       )}
@@ -166,7 +135,7 @@ export function PartsOrderListTableComponent({
                 is_credit_memo: record.return,
                 billlines: record.parts_order_lines.map((pol) => {
                   return {
-                    joblineid: pol.job_line_id,
+                    joblineid: pol.job_line_id || "noline",
                     line_desc: pol.line_desc,
                     quantity: pol.quantity,
 
@@ -277,164 +246,6 @@ export function PartsOrderListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
-  const selectedPartsOrderRecord = parts_orders.find(
-    (r) => r.id === selectedpartsorder
-  );
-
-  const rowExpander = (record) => {
-    const columns = [
-      {
-        title: t("parts_orders.fields.line_desc"),
-        dataIndex: "line_desc",
-        key: "line_desc",
-        sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
-        sortOrder:
-          state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
-      },
-      {
-        title: t("parts_orders.fields.quantity"),
-        dataIndex: "quantity",
-        key: "quantity",
-        sorter: (a, b) => a.quantity - b.quantity,
-        sortOrder:
-          state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
-      },
-      {
-        title: t("parts_orders.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,
-        render: (text, record) => (
-          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
-        ),
-      },
-      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
-        ? [
-            {
-              title: t("parts_orders.fields.cost"),
-              dataIndex: "cost",
-              key: "cost",
-              sorter: (a, b) => a.cost - b.cost,
-              sortOrder:
-                state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
-              render: (text, record) => (
-                <CurrencyFormatter>{record.cost}</CurrencyFormatter>
-              ),
-            },
-          ]
-        : []),
-      {
-        title: t("parts_orders.fields.part_type"),
-        dataIndex: "part_type",
-        key: "part_type",
-        render: (text, record) =>
-          record.part_type
-            ? t(`joblines.fields.part_types.${record.part_type}`)
-            : null,
-      },
-      {
-        title: t("parts_orders.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,
-      },
-      {
-        title: t("parts_orders.fields.line_remarks"),
-        dataIndex: "line_remarks",
-        key: "line_remarks",
-      },
-      {
-        title: t("parts_orders.fields.status"),
-        dataIndex: "status",
-        key: "status",
-      },
-
-      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
-        ? [
-            {
-              title: t("parts_orders.fields.cm_received"),
-              dataIndex: "cm_received",
-              key: "cm_received",
-              render: (text, record) => (
-                <PartsOrderCmReceived
-                  orderLineId={record.id}
-                  checked={record.cm_received}
-                  partsorderid={selectedPartsOrderRecord.id}
-                />
-              ),
-            },
-          ]
-        : []),
-      {
-        title: t("parts_orders.fields.backordered_on"),
-        dataIndex: "backordered_on",
-        key: "backordered_on",
-        render: (text, record) => <DateFormatter>{text}</DateFormatter>,
-      },
-      {
-        title: t("parts_orders.fields.backordered_eta"),
-        dataIndex: "backordered_eta",
-        key: "backordered_eta",
-        render: (text, record) => (
-          <PartsOrderBackorderEta
-            backordered_eta={record.backordered_eta}
-            disabled={jobRO}
-            partsOrderStatus={record.status}
-            partsLineId={record.id}
-            jobLineId={record.job_line_id}
-          />
-        ),
-      },
-
-      {
-        title: t("general.labels.actions"),
-        dataIndex: "actions",
-        key: "actions",
-        render: (text, record) => (
-          <Space wrap>
-            <PartsOrderDeleteLine
-              disabled={jobRO}
-              partsOrderStatus={record.status}
-              partsLineId={record.id}
-              partsOrderId={selectedpartsorder}
-              jobLineId={record.job_line_id}
-            />
-            <PartsOrderLineBackorderButton
-              disabled={jobRO}
-              partsOrderStatus={record.status}
-              partsLineId={record.id}
-              jobLineId={record.job_line_id}
-            />
-          </Space>
-        ),
-      },
-    ];
-
-    return (
-      <div>
-        <PageHeader
-          title={record && `${record.vendor.name} - ${record.order_number}`}
-          extra={recordActions(record)}
-        />
-        <Table
-          scroll={{
-            x: true, //y: "50rem"
-          }}
-          columns={columns}
-          rowKey="id"
-          dataSource={record.parts_order_lines}
-        />
-        <DataLabel label={t("parts_orders.fields.comments")}>
-          <div style={{ whiteSpace: "pre" }}>{record.comments}</div>
-        </DataLabel>
-      </div>
-    );
-  };
-
   const filteredPartsOrders = parts_orders
     ? searchText === ""
       ? parts_orders
@@ -470,15 +281,12 @@ export function PartsOrderListTableComponent({
       }
     >
       <PartsReceiveModalContainer />
-      <Drawer
-        placement="right"
-        onClose={() => handleOnRowClick(null)}
-        visible={selectedpartsorder}
-        closable
-        width={drawerPercentage}
-      >
-        {selectedPartsOrderRecord && rowExpander(selectedPartsOrderRecord)}
-      </Drawer>
+      <PartsOrderDrawer
+        job={job}
+        billsQuery={billsQuery}
+        handleOnRowClick={handleOnRowClick}
+        setPartsReceiveContext={setPartsReceiveContext}
+      />
       <Table
         loading={billsQuery.loading}
         scroll={{

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

@@ -1,17 +1,17 @@
-import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons";
+import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
+  Checkbox,
   Divider,
+  Dropdown,
   Form,
   Input,
   InputNumber,
+  Menu,
   Radio,
+  Select,
   Space,
   Tag,
-  Select,
-  Menu,
-  Dropdown,
-  Checkbox,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -255,7 +255,7 @@ export function PartsOrderModalComponent({
                           },
                         ]}
                       >
-                        <InputNumber />
+                        <InputNumber min={1} />
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.act_price")}

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

@@ -1,12 +1,16 @@
-import { useMutation, useQuery, useApolloClient } from "@apollo/client";
+import { useApolloClient, useMutation, useQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 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 { logImEXEvent, auth } from "../../firebase/firebase.utils";
+import { auth, logImEXEvent } 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,
@@ -29,10 +33,6 @@ 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 }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function PartsOrderModalContainer({
@@ -142,6 +142,7 @@ 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

@@ -0,0 +1,77 @@
+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

@@ -0,0 +1,208 @@
+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/parts-queue-list/parts-queue.list.component.jsx

@@ -8,30 +8,28 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import AlertComponent from "../../components/alert/alert.component";
-import JobPartsQueueCount from "../../components/job-parts-queue-count/job-parts-queue-count.component";
-import JobRemoveFromPartsQueue from "../../components/job-remove-from-parst-queue/job-remove-from-parts-queue.component";
-import OwnerNameDisplay from "../../components/owner-name-display/owner-name-display.component";
-import ProductionListColumnComment from "../../components/production-list-columns/production-list-columns.comment.component";
 import { QUERY_PARTS_QUEUE } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter, TimeAgoFormatter } from "../../utils/DateFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
-import {pageLimit} from "../../utils/config";
+import AlertComponent from "../alert/alert.component";
+import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
+import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 
-export function PartsQueuePageComponent({ bodyshop }) {
+export function PartsQueueListComponent({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
-  const {
-    //page,
-    sortcolumn,
-    sortorder,
-    statusFilters,
-  } = searchParams;
+  const { selected, sortcolumn, sortorder, statusFilters } = searchParams;
   const history = useHistory();
   const [filter, setFilter] = useLocalStorage("filter_parts_queue", null);
 
@@ -39,19 +37,8 @@ export function PartsQueuePageComponent({ bodyshop }) {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     variables: {
-      // offset: page ? (page - 1) * 25 : 0,
-      // limit: 25,
       statuses: (statusFilters && JSON.parse(statusFilters)) ||
         bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
-      order: [
-        {
-          [sortcolumn || "ro_number"]: sortorder
-            ? sortorder === "descend"
-              ? "desc"
-              : "asc"
-            : "desc",
-        },
-      ],
     },
   });
 
@@ -107,6 +94,17 @@ export function PartsQueuePageComponent({ bodyshop }) {
     history.push({ search: queryString.stringify(searchParams) });
   };
 
+  const handleOnRowClick = (record) => {
+    if (record?.id) {
+      history.replace({
+        search: queryString.stringify({
+          ...searchParams,
+          selected: record.id,
+        }),
+      });
+    }
+  };
+
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -125,7 +123,8 @@ export function PartsQueuePageComponent({ bodyshop }) {
       title: t("jobs.fields.owner"),
       dataIndex: "ownr_ln",
       key: "ownr_ln",
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
         return record.ownerid ? (
@@ -139,6 +138,56 @@ export function PartsQueuePageComponent({ bodyshop }) {
         );
       },
     },
+    {
+      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: sortcolumn === "vehicle" && sortorder,
+      render: (text, record) => {
+        return record.vehicleid ? (
+          <Link to={"/manage/vehicles/" + record.vehicleid}>
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`}
+          </Link>
+        ) : (
+          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          }`}</span>
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.ins_co_nm_short"),
+      dataIndex: "ins_co_nm",
+      key: "ins_co_nm",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder: sortcolumn === "ins_co_nm" && sortorder,
+      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),
+    },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
@@ -170,23 +219,16 @@ export function PartsQueuePageComponent({ bodyshop }) {
       ),
     },
     {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
+      title: t("jobs.fields.scheduled_completion"),
+      dataIndex: "scheduled_completion",
+      key: "scheduled_completion",
       ellipsis: true,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link to={"/manage/vehicles/" + record.vehicleid}>
-            {`${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>
-        );
-      },
+      sorter: (a, b) =>
+        dateSort(a.scheduled_completion, b.scheduled_completion),
+      sortOrder: sortcolumn === "scheduled_completion" && sortorder,
+      render: (text, record) => (
+        <DateTimeFormatter>{record.scheduled_completion}</DateTimeFormatter>
+      ),
     },
     // {
     //   title: t("vehicles.fields.plate_no"),
@@ -198,14 +240,6 @@ export function PartsQueuePageComponent({ bodyshop }) {
     //     return record.plate_no ? record.plate_no : "";
     //   },
     // },
-    {
-      title: t("jobs.fields.clm_no"),
-      dataIndex: "clm_no",
-      key: "clm_no",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder: sortcolumn === "clm_no" && sortorder,
-    },
     // {
     //   title: t("jobs.fields.clm_total"),
     //   dataIndex: "clm_total",
@@ -307,9 +341,23 @@ export function PartsQueuePageComponent({ bodyshop }) {
         style={{ height: "100%" }}
         scroll={{ x: true }}
         onChange={handleTableChange}
+        rowSelection={{
+          onSelect: (record) => {
+            handleOnRowClick(record);
+          },
+          selectedRowKeys: [selected],
+          type: "radio",
+        }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            },
+          };
+        }}
       />
     </Card>
   );
 }
 
-export default connect(mapStateToProps, null)(PartsQueuePageComponent);
+export default connect(mapStateToProps, null)(PartsQueueListComponent);

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,
@@ -139,8 +139,8 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
         contentStyle={{ fontWeight: "600" }}
         column={4}
       >
-        <Descriptions.Item label={t("job_payments.titles.payer")}>
-          {record.payer}
+        <Descriptions.Item label={t("job_payments.titles.hint")}>
+          {payment_response?.response?.methodhint}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.payername")}>
           {payment_response?.response?.nameOnCard ?? ""}
@@ -155,7 +155,7 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
           {record.transactionid}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.paymentid")}>
-          {payment_response?.response?.paymentreferenceid ?? ""}
+          {payment_response?.ext_paymentid ?? ""}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
           {record.type}

client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx

@@ -1,16 +1,18 @@
-import React from "react";
-import { Button, notification } from "antd";
 import { useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { setModalContext } from "../../redux/modals/modals.actions";
 import { connect } from "react-redux";
-import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { createStructuredSelector } from "reselect";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
+  paymentModal: selectPayment,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -24,6 +26,7 @@ const PaymentMarkForExportButton = ({
   refetch,
   setPaymentContext,
   currentUser,
+  paymentModal,
 }) => {
   const { t } = useTranslation();
   const [insertExportLog, { loading: exportLogLoading }] =
@@ -46,7 +49,6 @@ const PaymentMarkForExportButton = ({
         ],
       },
     });
-
     const paymentUpdateResponse = await updatePayment({
       variables: {
         paymentId: payment.id,
@@ -55,25 +57,33 @@ const PaymentMarkForExportButton = ({
         },
       },
     });
-
     if (!!!paymentUpdateResponse.errors) {
       notification.open({
         type: "success",
         key: "paymentsuccessmarkforexport",
         message: t("payments.successes.markexported"),
       });
-
-      if (refetch) refetch();
-
       setPaymentContext({
         actions: {
           refetch,
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: today,
         },
       });
+
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(
+            paymentUpdateResponse &&
+              paymentUpdateResponse.data.update_payments.returning[0]
+          );
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {

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

@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client";
-
 import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -19,8 +18,8 @@ import {
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import PaymentForm from "../payment-form/payment-form.component";
-import PaymentReexportButton from "../payment-reexport-button/payment-reexport-button.component";
 import PaymentMarkForExportButton from "../payment-mark-export-button/payment-mark-export-button-component";
+import PaymentReexportButton from "../payment-reexport-button/payment-reexport-button.component";
 
 const mapStateToProps = createStructuredSelector({
   paymentModal: selectPayment,
@@ -97,16 +96,21 @@ function PaymentModalContainer({
         });
 
         if (!!!updatedPayment.errors) {
-          notification["success"]({ message: t("payments.successes.payment") });
+          notification["success"]({ message: t("payments.successes.paymentupdate") });
         } else {
-          notification["error"]({ message: t("payments.errors.payment") });
+          notification["error"]({ message: t("payments.errors.paymentupdate") });
         }
       }
 
-      if (actions.refetch)
-        actions.refetch(
-          updatedPayment && updatedPayment.data.update_payments.returning[0]
-        );
+      if (actions.refetch) {
+        if (context.refetchRequiresContext) {
+          actions.refetch(
+            updatedPayment && updatedPayment.data.update_payments.returning[0]
+          );
+        } else {
+          actions.refetch();
+        }
+      }
 
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
@@ -159,7 +163,7 @@ function PaymentModalContainer({
       }}
       afterClose={() => form.resetFields()}
       footer={
-        <span>
+        <Space>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
           <Button loading={loading} onClick={() => form.submit()}>
             {t("general.actions.save")}
@@ -175,7 +179,7 @@ function PaymentModalContainer({
               {t("general.actions.saveandnew")}
             </Button>
           )}
-        </span>
+        </Space>
       }
     >
       {!context || (context && !context.id) ? null : (
@@ -194,7 +198,6 @@ function PaymentModalContainer({
         autoComplete={"off"}
         form={form}
         layout="vertical"
-        initialValues={context || {}}
         disabled={context?.exportedat}
       >
         <PaymentForm form={form} />

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

@@ -1,17 +1,27 @@
-import React from "react";
-import { Button, notification } from "antd";
-import { useTranslation } from "react-i18next";
-import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { useMutation } from "@apollo/client";
-import { setModalContext } from "../../redux/modals/modals.actions";
+import { Button, notification } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 
+const mapStateToProps = createStructuredSelector({
+  paymentModal: selectPayment,
+});
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "payment" })),
 });
 
-const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
+const PaymentReexportButton = ({
+  paymentModal,
+  payment,
+  refetch,
+  setPaymentContext,
+}) => {
   const { t } = useTranslation();
   const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
 
@@ -24,25 +34,32 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
         },
       },
     });
-
     if (!!!paymentUpdateResponse.errors) {
       notification.open({
         type: "success",
         key: "paymentsuccessexport",
         message: t("payments.successes.markreexported"),
       });
-
-      if (refetch) refetch();
-
       setPaymentContext({
         actions: {
           refetch,
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: null,
         },
       });
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(
+            paymentUpdateResponse &&
+              paymentUpdateResponse.data.update_payments.returning[0]
+          );
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {
@@ -63,4 +80,7 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
   );
 };
 
-export default connect(null, mapDispatchToProps)(PaymentReexportButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PaymentReexportButton);

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -14,11 +14,11 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { pageLimit } from "../../utils/config";
 import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -184,7 +184,10 @@ export function PaymentsListPaginated({
                       }
                     : refetch,
                 },
-                context: apolloResults ? apolloResults : record,
+                context: {
+                  ...(apolloResults ? apolloResults : record),
+                  refetchRequiresContext: true,
+                },
               });
             }}
           >

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

@@ -1,6 +1,12 @@
 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, {
@@ -8,12 +14,6 @@ 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,13 +46,19 @@ export function PhonebookFormComponent({
   return (
     <div>
       <PageHeader
-        title={`${form.getFieldValue("firstname") || ""} ${
-          form.getFieldValue("lastname") || ""
-        }${
-          form.getFieldValue("company")
-            ? ` - ${form.getFieldValue("company")}`
-            : ""
-        }`}
+        title={
+          <Form.Item shouldUpdate>
+            {() =>
+              `${form.getFieldValue("firstname") || ""} ${
+                form.getFieldValue("lastname") || ""
+              }${
+                form.getFieldValue("company")
+                  ? ` - ${form.getFieldValue("company")}`
+                  : ""
+              }`
+            }
+          </Form.Item>
+        }
         extra={
           <Space>
             <Button

client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx

@@ -6,6 +6,7 @@ import {
   notification,
   Popover,
   Radio,
+  Space,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,10 +116,16 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
         >
           <InputNumber min={1} precision={0} max={99} />
         </Form.Item>
-        <Button type="primary" loading={loading} onClick={handleOk}>
-          {t("general.actions.print")}
-        </Button>
-        <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" loading={loading} onClick={handleOk}>
+              {t("general.actions.print")}
+            </Button>
+            <Button onClick={handleCancel}>
+              {t("general.actions.cancel")}
+            </Button>
+          </Space>
+        </div>
       </Form>
     </Card>
   );

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

@@ -29,8 +29,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionBoardKanbanComponent({
@@ -115,7 +115,7 @@ export function ProductionBoardKanbanComponent({
       // console.log("==> New Card is somewhere in the middle");
       movedCardNewKanbanParent = newChildCard.kanbanparent;
     } else {
-      throw new Error("==> !!!!!!Couldn't find a parent.!!!! <==");
+      console.log("==> !!!!!!Couldn't find a parent.!!!! <==");
     }
     const newChildCardNewParent = newChildCard ? card.id : null;
     const update = await client.mutate({
@@ -133,6 +133,7 @@ export function ProductionBoardKanbanComponent({
     insertAuditTrail({
       jobid: card.id,
       operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
+      type: "jobstatuschange",
     });
 
     if (update.errors) {
@@ -153,7 +154,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-board-kanban/production-board-kanban.utils.js

@@ -18,8 +18,8 @@ const sortByParentId = (arr) => {
   //console.log("sortByParentId -> byParentsIdsList", byParentsIdsList);
 
   while (byParentsIdsList[parentId]) {
-    sortedList.push(byParentsIdsList[parentId][0]);
-    parentId = byParentsIdsList[parentId][0].id;
+    sortedList.push(...byParentsIdsList[parentId]); //Spread in the whole list in case several items have the same parents. 
+    parentId = byParentsIdsList[parentId][byParentsIdsList[parentId].length -1].id; //Grab the ID from the last one.
   }
 
   if (byParentsIdsList["null"])

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

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

@@ -13,8 +13,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionListColumnAlert({ record, insertAuditTrail }) {
@@ -46,6 +46,7 @@ export function ProductionListColumnAlert({ record, insertAuditTrail }) {
           ? !record.production_vars.alert
           : true
       ),
+      type: "alertToggle",
     }).then(() => {
       if (record.refetch) record.refetch();
     });

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

@@ -1,15 +1,15 @@
-import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
-import { Space, Tooltip } from "antd";
+import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
+import { Checkbox, 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 from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, { OwnerNameDisplayFunction } 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";
@@ -25,18 +25,14 @@ 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, bodyshop }) => {
+const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
       dataIndex: "viewdetail",
       key: "viewdetail",
       ellipsis: true,
-      render: (text, record) => (
-        <Link to={{ search: `?selected=${record.id}` }}>
-          {i18n.t("general.labels.view")}
-        </Link>
-      ),
+      render: (text, record) => <Link to={{ search: `?selected=${record.id}` }}>{i18n.t("general.labels.view")}</Link>
     },
     {
       title: i18n.t("jobs.fields.ro_number"),
@@ -44,23 +40,18 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "ro_number",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
       render: (text, record) =>
         technician ? (
           <Link to={`/tech/joblookup?selected=${record.id}`}>
             {record.ro_number}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
+            {record.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
           </Link>
         ) : (
           <Link to={`/manage/jobs/${record.id}`}>
             <Space>
               {record.ro_number}
-              {record.suspended && (
-                <PauseCircleOutlined style={{ color: "orangered" }} />
-              )}
+              {record.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
               {record.iouparent && (
                 <Tooltip title={i18n.t("jobs.labels.iou")}>
                   <BranchesOutlined style={{ color: "orangered" }} />
@@ -68,17 +59,23 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
               )}
             </Space>
           </Link>
-        ),
+        )
     },
     {
       title: i18n.t("jobs.fields.owner"),
       dataIndex: "ownr",
       key: "ownr",
       ellipsis: true,
-      render: (text, record) => <OwnerNameDisplay ownerObject={record} />,
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      sortOrder:
-        state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
+      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)),
+      sortOrder: state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order
     },
     {
       title: i18n.t("jobs.fields.vehicle"),
@@ -87,18 +84,22 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       ellipsis: true,
       sorter: (a, b) =>
         alphaSort(
-          a.v_make_desc + a.v_model_desc,
-          b.v_make_desc + b.v_model_desc
+          `${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) => (
-        <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>
-      ),
+      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>
+        )
     },
     {
       title: i18n.t("jobs.fields.actual_in"),
@@ -106,11 +107,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "actual_in",
       ellipsis: true,
       sorter: (a, b) => dateSort(a.actual_in, b.actual_in),
-      sortOrder:
-        state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListDate record={record} field="actual_in" time />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="actual_in" time />
     },
     {
       title: i18n.t("jobs.fields.actual_in") + " (HH:MM)",
@@ -118,28 +116,16 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "actual_in_time",
       ellipsis: true,
 
-      render: (text, record) => (
-        <TimeFormatter>{record.actual_in}</TimeFormatter>
-      ),
+      render: (text, record) => <TimeFormatter>{record.actual_in}</TimeFormatter>
     },
     {
       title: i18n.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) => (
-        <ProductionListDate
-          record={record}
-          field="scheduled_completion"
-          pastIndicator
-          time
-        />
-      ),
+      sorter: (a, b) => dateSort(a.scheduled_completion, b.scheduled_completion),
+      sortOrder: state.sortedInfo.columnKey === "scheduled_completion" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="scheduled_completion" pastIndicator time />
     },
     {
       title: i18n.t("jobs.fields.scheduled_completion") + " (HH:MM)",
@@ -147,9 +133,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "scheduled_completion_time",
       ellipsis: true,
 
-      render: (text, record) => (
-        <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
-      ),
+      render: (text, record) => <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
     },
     {
       title: i18n.t("jobs.fields.date_last_contacted"),
@@ -157,10 +141,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "date_last_contacted",
       ellipsis: true,
       sorter: (a, b) => dateSort(a.date_last_contacted, b.date_last_contacted),
-      sortOrder:
-        state.sortedInfo.columnKey === "date_last_contacted" &&
-        state.sortedInfo.order,
-      render: (text, record) => <ProductionListLastContacted record={record} />,
+      sortOrder: state.sortedInfo.columnKey === "date_last_contacted" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListLastContacted record={record} />
     },
     {
       title: i18n.t("jobs.fields.date_next_contact"),
@@ -168,22 +150,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "date_next_contact",
       ellipsis: true,
       sorter: (a, b) => dateSort(a.date_next_contact, b.date_next_contact),
-      sortOrder:
-        state.sortedInfo.columnKey === "date_next_contact" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <span
-          style={{
-            color:
-              record.date_next_contact &&
-              moment(record.date_next_contact).isBefore(moment())
-                ? "red"
-                : "",
-          }}
-        >
-          <ProductionListDate record={record} field="date_next_contact" time />
-        </span>
-      ),
+      sortOrder: state.sortedInfo.columnKey === "date_next_contact" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="date_next_contact" pastIndicator time />
     },
     {
       title: i18n.t("jobs.fields.scheduled_delivery"),
@@ -191,17 +159,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "scheduled_delivery",
       ellipsis: true,
       sorter: (a, b) => dateSort(a.scheduled_delivery, b.scheduled_delivery),
-      sortOrder:
-        state.sortedInfo.columnKey === "scheduled_delivery" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListDate
-          record={record}
-          field="scheduled_delivery"
-          pastIndicator
-          time
-        />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "scheduled_delivery" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="scheduled_delivery" pastIndicator time />
     },
     {
       title: i18n.t("jobs.fields.scheduled_delivery") + " (HH:MM)",
@@ -209,9 +168,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "scheduled_delivery_time",
       ellipsis: true,
 
-      render: (text, record) => (
-        <TimeFormatter>{record.scheduled_delivery}</TimeFormatter>
-      ),
+      render: (text, record) => <TimeFormatter>{record.scheduled_delivery}</TimeFormatter>
     },
     {
       title: i18n.t("jobs.fields.ins_co_nm"),
@@ -219,8 +176,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       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,
+      sortOrder: state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order
     },
     {
       title: i18n.t("jobs.fields.clm_no"),
@@ -228,8 +184,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "clm_no",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order
     },
     {
       title: i18n.t("jobs.fields.clm_total"),
@@ -237,11 +192,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "clm_total",
       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>
-      ),
+      sortOrder: state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+      render: (text, record) => <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
     },
     {
       title: i18n.t("jobs.fields.owner_owing"),
@@ -249,35 +201,36 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "owner_owing",
       ellipsis: true,
       sorter: (a, b) => a.owner_owing - b.owner_owing,
-      sortOrder:
-        state.sortedInfo.columnKey === "owner_owing" && state.sortedInfo.order,
-      render: (text, record) => (
-        <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
-      ),
+      sortOrder: state.sortedInfo.columnKey === "owner_owing" && state.sortedInfo.order,
+      render: (text, record) => <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
     },
     {
       title: i18n.t("jobs.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => (
-        <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
-      ),
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => (
-        <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
-      ),
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.specialcoveragepolicy"),
       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 === record.special_coverage_policy,
+      render: (text, record) => <Checkbox checked={record.special_coverage_policy} />
     },
 
     {
@@ -286,15 +239,23 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "alt_transport",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
-      sortOrder:
-        state.sortedInfo.columnKey === "alt_transport" &&
-        state.sortedInfo.order,
+      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}
           <JobAltTransportChange job={record} />
         </div>
-      ),
+      )
     },
     {
       title: i18n.t("jobs.fields.status"),
@@ -302,9 +263,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "status",
       ellipsis: true,
       sorter: (a, b) => statusSort(a.status, b.status, activeStatuses),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      render: (text, record) => <ProductionListColumnStatus record={record} />,
+      sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListColumnStatus record={record} />
     },
     {
       title: i18n.t("jobs.fields.category"),
@@ -317,37 +277,30 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
           bodyshop.md_categories.map((s) => {
             return {
               text: s,
-              value: [s],
+              value: [s]
             };
           })) ||
         [],
       onFilter: (value, record) => value.includes(record.category),
       sorter: (a, b) => alphaSort(a.category, b.category),
-      sortOrder:
-        state.sortedInfo.columnKey === "category" && state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListColumnCategory record={record} />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "category" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListColumnCategory record={record} />
     },
     {
       title: i18n.t("production.labels.bodyhours"),
       dataIndex: "labhrs",
       key: "labhrs",
-      sorter: (a, b) =>
-        a.labhrs.aggregate.sum.mod_lb_hrs - b.labhrs.aggregate.sum.mod_lb_hrs,
-      sortOrder:
-        state.sortedInfo.columnKey === "labhrs" && state.sortedInfo.order,
-      render: (text, record) => record.labhrs.aggregate.sum.mod_lb_hrs,
+      sorter: (a, b) => a.labhrs.aggregate.sum.mod_lb_hrs - b.labhrs.aggregate.sum.mod_lb_hrs,
+      sortOrder: state.sortedInfo.columnKey === "labhrs" && state.sortedInfo.order,
+      render: (text, record) => record.labhrs.aggregate.sum.mod_lb_hrs
     },
     {
       title: i18n.t("production.labels.refinishhours"),
       dataIndex: "larhrs",
       key: "larhrs",
-      sorter: (a, b) =>
-        a.larhrs.aggregate.sum.mod_lb_hrs - b.larhrs.aggregate.sum.mod_lb_hrs,
-      sortOrder:
-        state.sortedInfo.columnKey === "larhrs" && state.sortedInfo.order,
-      render: (text, record) => record.larhrs.aggregate.sum.mod_lb_hrs,
+      sorter: (a, b) => a.larhrs.aggregate.sum.mod_lb_hrs - b.larhrs.aggregate.sum.mod_lb_hrs,
+      sortOrder: state.sortedInfo.columnKey === "larhrs" && state.sortedInfo.order,
+      render: (text, record) => record.larhrs.aggregate.sum.mod_lb_hrs
     },
     {
       title: i18n.t("production.labels.totalhours"),
@@ -357,34 +310,36 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         a.labhrs.aggregate.sum.mod_lb_hrs +
         a.larhrs.aggregate.sum.mod_lb_hrs -
         (b.labhrs.aggregate.sum.mod_lb_hrs + b.larhrs.aggregate.sum.mod_lb_hrs),
-      sortOrder:
-        state.sortedInfo.columnKey === "totalhours" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "totalhours" && state.sortedInfo.order,
       render: (text, record) =>
-        (
-          record.labhrs.aggregate.sum.mod_lb_hrs +
-          record.larhrs.aggregate.sum.mod_lb_hrs
-        ).toFixed(1),
+        (record.labhrs.aggregate.sum.mod_lb_hrs + record.larhrs.aggregate.sum.mod_lb_hrs).toFixed(1)
     },
     {
       title: i18n.t("production.labels.alert"),
       dataIndex: "alert",
       key: "alert",
-
-      render: (text, record) => <ProductionListColumnAlert record={record} />,
+      sorter: (a, b) => Number(a.production_vars?.alert || false) - Number(b.production_vars?.alert || false),
+      sortOrder: state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
+      filters: [
+        { text: "True", value: true },
+        { text: "False", value: false }
+      ],
+      onFilter: (value, record) => value === (record.production_vars?.alert || false),
+      render: (text, record) => <ProductionListColumnAlert record={record} />
     },
     {
       title: i18n.t("production.labels.note"),
       dataIndex: "note",
       key: "note",
       ellipsis: true,
-      render: (text, record) => <ProductionListColumnNote record={record} />,
+      render: (text, record) => <ProductionListColumnNote record={record} />
     },
     {
       title: i18n.t("production.labels.comment"),
       dataIndex: "comment",
       key: "comment",
       ellipsis: true,
-      render: (text, record) => <ProductionListColumnComment record={record} />,
+      render: (text, record) => <ProductionListColumnComment record={record} />
     },
     {
       title: i18n.t("production.labels.touchtime"),
@@ -392,7 +347,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "tt",
       render: (text, record) => {
         return <ProductionlistColumnTouchTime job={record} />;
-      },
+      }
     },
     {
       title: i18n.t("production.labels.bodypriority"),
@@ -402,11 +357,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       sorter: (a, b) =>
         ((a.production_vars && a.production_vars.bodypriority) || 11) -
         ((b.production_vars && b.production_vars.bodypriority) || 11),
-      sortOrder:
-        state.sortedInfo.columnKey === "bodypriority" && state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListColumnBodyPriority record={record} />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "bodypriority" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListColumnBodyPriority record={record} />
     },
     {
       title: i18n.t("production.labels.paintpriority"),
@@ -416,12 +368,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       sorter: (a, b) =>
         ((a.production_vars && a.production_vars.paintpriority) || 11) -
         ((b.production_vars && b.production_vars.paintpriority) || 11),
-      sortOrder:
-        state.sortedInfo.columnKey === "paintpriority" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListColumnPaintPriority record={record} />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "paintpriority" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListColumnPaintPriority record={record} />
     },
     {
       title: i18n.t("production.labels.detailpriority"),
@@ -431,110 +379,99 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       sorter: (a, b) =>
         ((a.production_vars && a.production_vars.detailpriority) || 11) -
         ((b.production_vars && b.production_vars.detailpriority) || 11),
-      sortOrder:
-        state.sortedInfo.columnKey === "detailpriority" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListColumnDetailPriority record={record} />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "detailpriority" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListColumnDetailPriority record={record} />
     },
     {
       title: i18n.t("production.labels.sublets"),
       dataIndex: "sublets",
       key: "sublets",
-      render: (text, record) => (
-        <ProductionSubletsManageComponent subletJobLines={record.subletLines} />
-      ),
+      render: (text, record) => <ProductionSubletsManageComponent subletJobLines={record.subletLines} />
     },
     {
       title: i18n.t("jobs.fields.employee_body"),
       dataIndex: "employee_body",
       key: "employee_body",
-      sortOrder:
-        state.sortedInfo.columnKey === "employee_body" &&
-        state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "employee_body" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
           bodyshop.employees?.find((e) => e.id === a.employee_body)?.first_name,
           bodyshop.employees?.find((e) => e.id === b.employee_body)?.first_name
         ),
-      render: (text, record) => (
-        <ProductionListEmployeeAssignment
-          record={record}
-          type="employee_body"
-        />
-      ),
+      render: (text, record) => <ProductionListEmployeeAssignment record={record} type="employee_body" />
     },
     {
       title: i18n.t("jobs.fields.employee_prep"),
       dataIndex: "employee_prep",
       key: "employee_prep",
-      sortOrder:
-        state.sortedInfo.columnKey === "employee_prep" &&
-        state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "employee_prep" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
           bodyshop.employees?.find((e) => e.id === a.employee_prep)?.first_name,
           bodyshop.employees?.find((e) => e.id === b.employee_prep)?.first_name
         ),
-      render: (text, record) => (
-        <ProductionListEmployeeAssignment
-          record={record}
-          type="employee_prep"
-        />
-      ),
+      render: (text, record) => <ProductionListEmployeeAssignment record={record} type="employee_prep" />
     },
     {
       title: i18n.t("jobs.fields.employee_csr"),
       dataIndex: "employee_csr",
       key: "employee_csr",
-      sortOrder:
-        state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
           bodyshop.employees?.find((e) => e.id === a.employee_csr)?.first_name,
           bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
         ),
-      render: (text, record) => (
-        <ProductionListEmployeeAssignment record={record} type="employee_csr" />
-      ),
+      render: (text, record) => <ProductionListEmployeeAssignment record={record} type="employee_csr" />
     },
     {
       title: i18n.t("jobs.fields.employee_refinish"),
       dataIndex: "employee_refinish",
       key: "employee_refinish",
-      sortOrder:
-        state.sortedInfo.columnKey === "employee_refinish" &&
-        state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "employee_refinish" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees?.find((e) => e.id === a.employee_refinish)
-            ?.first_name,
-          bodyshop.employees?.find((e) => e.id === b.employee_refinish)
-            ?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_refinish)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_refinish)?.first_name
         ),
-      render: (text, record) => (
-        <ProductionListEmployeeAssignment
-          record={record}
-          type="employee_refinish"
-        />
-      ),
+      render: (text, record) => <ProductionListEmployeeAssignment record={record} type="employee_refinish" />
     },
     {
       title: i18n.t("jobs.labels.parts_received"),
       dataIndex: "parts_received",
       key: "parts_received",
-      render: (text, record) => (
-        <ProductionListColumnPartsReceived record={record} />
-      ),
+      render: (text, record) => <ProductionListColumnPartsReceived record={record} />
     },
     {
       title: i18n.t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => (
-        <JobPartsQueueCount parts={record.joblines_status} record={record} />
-      ),
+      render: (text, record) => <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.
@@ -564,12 +501,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "date_repairstarted",
       ellipsis: true,
       sorter: (a, b) => dateSort(a.date_repairstarted, b.date_repairstarted),
-      sortOrder:
-        state.sortedInfo.columnKey === "date_repairstarted" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <ProductionListDate record={record} field="date_repairstarted" time />
-      ),
+      sortOrder: state.sortedInfo.columnKey === "date_repairstarted" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="date_repairstarted" time />
     },
     {
       title: i18n.t("jobs.fields.date_repairstarted") + " (HH:MM)",
@@ -577,10 +510,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       key: "date_repairstarted_time",
       ellipsis: true,
 
-      render: (text, record) => (
-        <TimeFormatter>{record.date_repairstarted}</TimeFormatter>
-      ),
-    },
+      render: (text, record) => <TimeFormatter>{record.date_repairstarted}</TimeFormatter>
+    }
   ];
 };
 export default r;