Merge remote-tracking branch 'origin/feature/major-package-upgrades' into feature/america

client/craco.config.js

@@ -1,6 +1,5 @@
 // craco.config.js
 const TerserPlugin = require("terser-webpack-plugin");
-const CracoLessPlugin = require("craco-less");
 const SentryWebpackPlugin = require("@sentry/webpack-plugin");
 
 module.exports = {
@@ -20,37 +19,6 @@ module.exports = {
         ignore: ["node_modules", "webpack.config.js"],
       },
     },
-    {
-      plugin: CracoLessPlugin,
-      options: {
-        lessLoaderOptions: {
-          lessOptions: {
-            modifyVars: {
-              ...(process.env.NODE_ENV === "development"
-                ? { "@primary-color": "#B22234" }
-                : {
-                    //"@primary-color": "#1DA57A"
-                  }),
-              // "@primary-color": " #1890ff", // primary color for all components
-              // "@link-color": "#1890ff", // link color
-              // "@success-color": "#52c41a", // success state color
-              // "@warning-color": "#faad14", // warning state color
-              // "@error-color": "#f5222d", // error state color
-              // "@font-size-base": "14px", // major text font size
-              // " @heading-color": "rgba(0, 0, 0, 0.85)", // heading text color
-              // "@text-color": "rgba(0, 0, 0, 0.65)", // major text color
-              // "@text-color-secondary": "rgba(0, 0, 0, 0.45)", // secondary text color
-              // "@disabled-color": "rgba(0, 0, 0, 0.25)", // disable state color
-              // "@border-radius-base": "2px", // major border radius
-              // "@border-color-base": "#d9d9d9", // major border color
-              // "@box-shadow-base":
-              //   "0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),0 9px 28px 8px rgba(0, 0, 0, 0.05); // major shadow for layers }",
-            },
-            javascriptEnabled: true,
-          },
-        },
-      },
-    },
   ],
   webpack: {
     configure: (webpackConfig) => ({

client/package.json

@@ -4,59 +4,55 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
+    "@ant-design/pro-layout": "^7.6.1",
     "@apollo/client": "^3.6.9",
     "@asseinfo/react-kanban": "^2.2.0",
-    "@craco/craco": "^6.4.5",
+    "@craco/craco": "^7.0.0",
-    "@fingerprintjs/fingerprintjs": "^3.3.3",
     "@jsreport/browser-client": "^3.1.0",
     "@sentry/react": "^7.28.1",
     "@sentry/tracing": "^7.28.1",
     "@splitsoftware/splitio-react": "^1.6.0",
     "@tanem/react-nprogress": "^5.0.8",
-    "antd": "^4.22.3",
+    "antd": "5.1.5",
     "apollo-link-logger": "^2.0.0",
-    "axios": "^0.27.2",
+    "axios": "^1.2.3",
-    "craco-less": "^1.20.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.0.1",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
     "firebase": "^9.9.1",
     "graphql": "^16.5.0",
-    "i18next": "^21.8.14",
+    "i18next": "^22.4.6",
-    "i18next-browser-languagedetector": "^6.1.4",
+    "i18next-browser-languagedetector": "^7.0.1",
-    "jsoneditor": "^9.9.0",
     "jsreport-browser-client-dist": "^1.3.0",
     "libphonenumber-js": "^1.10.9",
     "logrocket": "^3.0.1",
     "markerjs2": "^2.22.0",
     "moment-business-days": "^1.2.0",
     "moment-timezone": "^0.5.34",
-    "normalize-url": "^7.0.3",
+    "normalize-url": "^8.0.0",
-    "phone": "^3.1.23",
+    "phone": "^3.1.32",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^7.1.1",
+    "query-string": "^8.1.0",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
-    "react-big-calendar": "^1.5.0",
+    "react-big-calendar": "^1.5.2",
     "react-color": "^2.19.3",
-    "react-cookie": "^4.1.1",
+    "react-dom": "^18.2.0",
-    "react-dom": "^17.0.2",
+    "react-drag-listview": "^2.0.0",
-    "react-drag-listview": "^0.2.1",
+    "react-grid-gallery": "^1.0.0",
-    "react-grid-gallery": "^0.5.5",
     "react-grid-layout": "^1.3.4",
-    "react-i18next": "^11.18.1",
+    "react-i18next": "^12.1.1",
-    "react-icons": "^4.4.0",
+    "react-icons": "^4.7.1",
-    "react-number-format": "^4.9.3",
+    "react-image-lightbox": "^5.1.4",
-    "react-redux": "^7.2.8",
+    "react-number-format": "^5.1.2",
+    "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",
     "react-router-dom": "^5.3.0",
-    "react-scripts": "^4.0.3",
+    "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
-    "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
     "recharts": "^2.1.12",
     "redux": "^4.2.0",
@@ -68,7 +64,7 @@
     "socket.io-client": "^4.5.1",
     "styled-components": "^5.3.5",
     "subscriptions-transport-ws": "^0.11.0",
-    "web-vitals": "^2.1.4",
+    "web-vitals": "^3.1.0",
     "workbox-background-sync": "^6.5.3",
     "workbox-broadcast-update": "^6.5.3",
     "workbox-cacheable-response": "^6.5.3",
@@ -80,12 +76,12 @@
     "workbox-range-requests": "^6.5.3",
     "workbox-routing": "^6.5.3",
     "workbox-strategies": "^6.5.3",
-    "workbox-streams": "^6.5.3",
+    "workbox-streams": "^6.5.3"
-    "yauzl": "^2.10.0"
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
+    "startrs": "react-scripts start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "build:test": "env-cmd -f .env.test yarn run build",
     "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
@@ -118,8 +114,8 @@
   },
   "devDependencies": {
     "@sentry/webpack-plugin": "^1.20.0",
-    "@testing-library/cypress": "^8.0.3",
+    "@testing-library/cypress": "^9.0.0",
-    "cypress": "^10.3.1",
+    "cypress": "^12.3.0",
     "eslint-plugin-cypress": "^2.12.1",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",

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

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

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

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

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

@@ -1,5 +1,6 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, PageHeader, Popconfirm, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Popconfirm, Space } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useState } from "react";
@@ -178,7 +179,7 @@ export function BillDetailEditcontainer({
                 <BillDetailEditReturn data={data} />
 
                 <Popconfirm
-                  visible={visible}
+                  open={visible}
                   onConfirm={() => form.submit()}
                   onCancel={() => setVisible(false)}
                   okButtonProps={{ loading: updateLoading }}

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

@@ -77,7 +77,7 @@ export function BillDetailEditReturn({
   return (
     <>
       <Modal
-        visible={visible}
+        open={visible}
         onCancel={() => setVisible(false)}
         destroyOnClose
         title={t("bills.actions.return")}

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

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

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

@@ -344,7 +344,7 @@ function BillEnterModalContainer({
     <Modal
       title={t("bills.labels.new")}
       width={"98%"}
-      visible={billEnterModal.visible}
+      open={billEnterModal.visible}
       okText={t("general.actions.save")}
       keyboard="false"
       onOk={() => form.submit()}

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

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

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

@@ -35,7 +35,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
     <Popover
       destroyTooltipOnHide
       content={popContent}
-      visible={visibility}
+      open={visibility}
       disabled={disabled}
     >
       <Button disabled={disabled} onClick={() => setVisibility(true)}>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 import { WarningFilled } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { Button, Form, Input, InputNumber, PageHeader, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Input, InputNumber, Space } from "antd";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";

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

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

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

@@ -3,21 +3,19 @@ import {
   Button,
   Card,
   Dropdown,
-  Input,
+  Input, Space,
-  Menu,
-  Space,
   Table,
-  Tooltip,
+  Tooltip
 } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-import moment from "moment";
 import { GenerateDocument } from "../../utils/RenderTemplate";
+import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
@@ -179,10 +177,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           </Button>
           <Dropdown
             trigger="click"
-            overlay={
+            menu={{
-              <Menu>
+              items: [
-                <Menu.Item
+                {
-                  onClick={() =>
+                  label: t(
+                    "printcenter.courtesycarcontract.courtesy_car_inventory"
+                  ),
+                  key: "cc_inv",
+                  onClick: () =>
                     GenerateDocument(
                       {
                         name: TemplateList("courtesycar").courtesy_car_inventory
@@ -193,13 +195,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                       },
                       {},
                       "p"
-                    )
+                    ),
-                  }
+                },
-                >
+              ],
-                  {t("printcenter.courtesycarcontract.courtesy_car_inventory")}
+            }}
-                </Menu.Item>
-              </Menu>
-            }
           >
             <Button>{t("general.labels.print")}</Button>
           </Dropdown>

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

@@ -1,6 +1,7 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
 import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, Menu, notification, PageHeader, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Dropdown, Menu, notification, Space } from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
@@ -117,17 +118,15 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
   );
   const existingLayoutKeys = state.items.map((i) => i.i);
   const addComponentOverlay = (
-    <Menu onClick={handleAddComponent}>
+    <Menu
-      {Object.keys(componentList).map((key) => (
+      onClick={handleAddComponent}
-        <Menu.Item
+      items={Object.keys(componentList).map((key) => ({
-          key={key}
+        key: key,
-          value={key}
+        value: key,
-          disabled={existingLayoutKeys.includes(key)}
+        disabled: existingLayoutKeys.includes(key),
-        >
+        label: componentList[key].label,
-          {componentList[key].label}
+      }))}
-        </Menu.Item>
+    ></Menu>
-      ))}
-    </Menu>
   );
 
   if (error) return <AlertComponent message={error.message} type="error" />;
@@ -283,8 +282,12 @@ const createDashboardQuery = (state) => {
       monthly_sales: jobs(where: {_and: [
         { voided: {_eq: false}},
         {date_invoiced: {_gte: "${moment()
-        .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+          .startOf("month")
-    .endOf("month").endOf('day').toISOString()}"}}]}) {
+          .startOf("day")
+          .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+    .endOf("month")
+    .endOf("day")
+    .toISOString()}"}}]}) {
     id
     ro_number
     date_invoiced

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

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

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

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

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

@@ -57,20 +57,23 @@ export function EmailOverlayComponent({
 
   const menu = (
     <div>
-      <Menu onClick={handleClick}>
+      <Menu
-        {bodyshop.employees
+        onClick={handleClick}
-          .filter((e) => e.user_email)
+        items={[
-          .map((e, idx) => (
+          ...bodyshop.employees
-            <Menu.Item value={e.user_email} key={idx}>
+            .filter((e) => e.user_email)
-              {`${e.first_name} ${e.last_name}`}
+            .map((e, idx) => ({
-            </Menu.Item>
+              value: e.user_email,
-          ))}
+              key: idx,
-        {bodyshop.md_to_emails.map((e, idx) => (
+              label: `${e.first_name} ${e.last_name}`,
-          <Menu.Item value={e.emails} key={idx + "group"}>
+            })),
-            {e.label}
+          ...bodyshop.md_to_emails.map((e, idx) => ({
-          </Menu.Item>
+            value: e.emails,
-        ))}
+            key: idx + "group",
-      </Menu>
+            label: e.label,
+          })),
+        ]}
+      />
     </div>
   );
 

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

@@ -174,7 +174,7 @@ export function EmailOverlayContainer({
   return (
     <Modal
       destroyOnClose={true}
-      visible={modalVisible}
+      open={modalVisible}
       maskClosable={false}
       width={"80%"}
       onOk={() => form.submit()}

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

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

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

@@ -106,304 +106,428 @@ function Header({
         selectedKeys={[selectedHeader]}
         onClick={handleMenuClick}
         subMenuCloseDelay={0.3}
-      >
+        items={[
-        <Menu.Item key="home" icon={<HomeFilled />}>
-          <Link to="/manage">{t("menus.header.home")}</Link>
-        </Menu.Item>
-        <Menu.Item key="schedule" icon={<Icon component={FaCalendarAlt} />}>
-          <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
-        </Menu.Item>
-        <Menu.SubMenu
-          key="jobssubmenu"
-          icon={<Icon component={FaCarCrash} />}
-          title={t("menus.header.jobs")}
-        >
-          <Menu.Item key="activejobs" icon={<FileFilled />}>
-            <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
-          </Menu.Item>
-          <Menu.Item key="readyjobs" icon={<CheckCircleOutlined />}>
-            <Link to="/manage/jobs/ready">{t("menus.header.readyjobs")}</Link>
-          </Menu.Item>
-          <Menu.Item key="parts-queue" icon={<ToolFilled />}>
-            <Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
-          </Menu.Item>
-          <Menu.Item key="availablejobs" icon={<ImportOutlined />}>
-            <Link to="/manage/available">
-              {t("menus.header.availablejobs")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="newjob" icon={<FileAddOutlined />}>
-            <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
-          </Menu.Item>
-          <Menu.Divider key="div1" />
-          <Menu.Item key="alljobs" icon={<UnorderedListOutlined />}>
-            <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
-          </Menu.Item>
-          <Menu.Divider key="div2" />
-          <Menu.Item key="productionlist" icon={<ScheduleOutlined />}>
-            <Link to="/manage/production/list">
-              {t("menus.header.productionlist")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="productionboard" icon={<Icon component={BsKanban} />}>
-            <Link to="/manage/production/board">
-              {t("menus.header.productionboard")}
-            </Link>
-          </Menu.Item>
-          <Menu.Divider key="div3" />
-          <Menu.Item key="scoreboard" icon={<LineChartOutlined />}>
-            <Link to="/manage/scoreboard">{t("menus.header.scoreboard")}</Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="customers"
-          icon={<UserOutlined />}
-          title={t("menus.header.customers")}
-        >
-          <Menu.Item key="owners" icon={<TeamOutlined />}>
-            <Link to="/manage/owners">{t("menus.header.owners")}</Link>
-          </Menu.Item>
-          <Menu.Item key="vehicles" icon={<CarFilled />}>
-            <Link to="/manage/vehicles">{t("menus.header.vehicles")}</Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="ccs"
-          icon={<CarFilled />}
-          title={t("menus.header.courtesycars")}
-        >
-          <Menu.Item key="courtesycarsall" icon={<CarFilled />}>
-            <Link to="/manage/courtesycars">
-              {t("menus.header.courtesycars-all")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="contracts" icon={<FileFilled />}>
-            <Link to="/manage/courtesycars/contracts">
-              {t("menus.header.courtesycars-contracts")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="newcontract" icon={<FileAddFilled />}>
-            <Link to="/manage/courtesycars/contracts/new">
-              {t("menus.header.courtesycars-newcontract")}
-            </Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="accounting"
-          icon={<DollarCircleFilled />}
-          title={t("menus.header.accounting")}
-        >
-          <Menu.Item
-            key="bills"
-            icon={<Icon component={FaFileInvoiceDollar} />}
-          >
-            <Link to="/manage/bills">{t("menus.header.bills")}</Link>
-          </Menu.Item>
-          <Menu.Item
-            key="enterbills"
-            icon={<Icon component={GiPayMoney} />}
-            onClick={() => {
-              setBillEnterContext({
-                actions: {},
-                context: {},
-              });
-            }}
-          >
-            {t("menus.header.enterbills")}
-          </Menu.Item>
-          {Simple_Inventory.treatment === "on" && (
-            <>
-              <Menu.Divider key="div4" />
-              <Menu.Item
-                key="inventory"
-                icon={<Icon component={FaFileInvoiceDollar} />}
-              >
-                <Link to="/manage/inventory">
-                  {t("menus.header.inventory")}
-                </Link>
-              </Menu.Item>
-            </>
-          )}
-          <Menu.Divider key="div7" />
-          <Menu.Item key="allpayments" icon={<BankFilled />}>
-            <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
-          </Menu.Item>
-          <Menu.Item
-            key="enterpayments"
-            onClick={() => {
-              setPaymentContext({
-                actions: {},
-                context: null,
-              });
-            }}
-            icon={<Icon component={FaCreditCard} />}
-          >
-            {t("menus.header.enterpayment")}
-          </Menu.Item>
-          <Menu.Divider key="div5" />
-          <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
-            <Link to="/manage/timetickets">
-              {t("menus.header.timetickets")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item
-            key="entertimetickets"
-            icon={<Icon component={GiPlayerTime} />}
-            onClick={() => {
-              setTimeTicketContext({
-                actions: {},
-                context: {},
-              });
-            }}
-          >
-            {t("menus.header.entertimeticket")}
-          </Menu.Item>
-          <Menu.Divider key="div6" />
-          <Menu.SubMenu
-            key="accountingexport"
-            title={t("menus.header.export")}
-            icon={<ExportOutlined />}
-          >
-            <Menu.Item key="receivables">
-              <Link to="/manage/accounting/receivables">
-                {t("menus.header.accounting-receivables")}
-              </Link>
-            </Menu.Item>
-            {(!(
-              (bodyshop && bodyshop.cdk_dealerid) ||
-              (bodyshop && bodyshop.pbs_serialnumber)
-            ) ||
-              DmsAp.treatment === "on") && (
-              <Menu.Item key="payables">
-                <Link to="/manage/accounting/payables">
-                  {t("menus.header.accounting-payables")}
-                </Link>
-              </Menu.Item>
-            )}
-            {!(
-              (bodyshop && bodyshop.cdk_dealerid) ||
-              (bodyshop && bodyshop.pbs_serialnumber)
-            ) && (
-              <Menu.Item key="payments">
-                <Link to="/manage/accounting/payments">
-                  {t("menus.header.accounting-payments")}
-                </Link>
-              </Menu.Item>
-            )}
-            <Menu.Item key="export-logs">
-              <Link to="/manage/accounting/exportlogs">
-                {t("menus.header.export-logs")}
-              </Link>
-            </Menu.Item>
-          </Menu.SubMenu>
-        </Menu.SubMenu>
-        <Menu.Item key="phonebook" icon={<PhoneOutlined />}>
-          <Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
-        </Menu.Item>
-        <Menu.Item key="temporarydocs" icon={<PaperClipOutlined />}>
-          <Link to="/manage/temporarydocs">
-            {t("menus.header.temporarydocs")}
-          </Link>
-        </Menu.Item>
-        <Menu.SubMenu
-          key="shopsubmenu"
-          title={t("menus.header.shop")}
-          icon={<SettingOutlined />}
-        >
-          <Menu.Item key="shop" icon={<Icon component={GiSettingsKnobs} />}>
-            <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
-          </Menu.Item>
-          <Menu.Item key="dashboard" icon={<DashboardFilled />}>
-            <Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>
-          </Menu.Item>
-          <Menu.Item
-            key="reportcenter"
-            icon={<BarChartOutlined />}
-            onClick={() => {
-              setReportCenterContext({
-                actions: {},
-                context: {},
-              });
-            }}
-          >
-            {t("menus.header.reportcenter")}
-          </Menu.Item>
-          <Menu.Item
-            key="shop-vendors"
-            icon={<Icon component={IoBusinessOutline} />}
-          >
-            <Link to="/manage/shop/vendors">
-              {t("menus.header.shop_vendors")}
-            </Link>
-          </Menu.Item>
-          <Menu.Item key="shop-csi" icon={<Icon component={RiSurveyLine} />}>
-            <Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link>
-          </Menu.Item>
-        </Menu.SubMenu>
-        <Menu.SubMenu
-          key="user"
-          title={
-            currentUser.displayName ||
-            currentUser.email ||
-            t("general.labels.unknown")
-          }
-        >
-          <Menu.Item key="signout" danger onClick={() => signOutStart()}>
-            {t("user.actions.signout")}
-          </Menu.Item>
-          <Menu.Item
-            key="help"
-            onClick={() => {
-              window.open("https://help.imex.online/", "_blank");
-            }}
-            icon={<Icon component={QuestionCircleFilled} />}
-          >
-            {t("menus.header.help")}
-          </Menu.Item>
-          <Menu.Item
-            key="rescue"
-            onClick={() => {
-              window.open("https://imexrescue.com/", "_blank");
-            }}
-          >
-            {t("menus.header.rescueme")}
-          </Menu.Item>
-          <Menu.Item key="shiftclock">
-            <Link to="/manage/shiftclock">{t("menus.header.shiftclock")}</Link>
-          </Menu.Item>
-          <Menu.Item key="profile">
-            <Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
-          </Menu.Item>
           {
-            //  <Menu.SubMenu
+            key: "home",
-            //           key="langselecter"
+            icon: <HomeFilled />,
-            //           title={
+            label: <Link to="/manage">{t("menus.header.home")}</Link>,
-            //             <span>
+          },
-            //               <GlobalOutlined />
+          {
-            //               <span>{t("menus.currentuser.languageselector")}</span>
+            key: "schedule",
-            //             </span>
+            icon: <Icon component={FaCalendarAlt} />,
-            //           }
+            label: (
-            //         >
+              <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
-            //           <Menu.Item actiontype="lang-select" key="en-US">
+            ),
-            //             {t("general.languages.english")}
+          },
-            //           </Menu.Item>
+          {
-            //           <Menu.Item actiontype="lang-select" key="fr-CA">
+            key: "jobssubmenu",
-            //             {t("general.languages.french")}
+            icon: <Icon component={FaCarCrash} />,
-            //           </Menu.Item>
+            label: t("menus.header.jobs"),
-            //           <Menu.Item actiontype="lang-select" key="es-MX">
+            children: [
-            //             {t("general.languages.spanish")}
+              {
-            //           </Menu.Item>
+                key: "activejobs",
-            //         </Menu.SubMenu>
+                icon: <FileFilled />,
-          }
+                label: (
-        </Menu.SubMenu>
+                  <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
-        <Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
+                ),
-          {recentItems.map((i, idx) => (
+              },
-            <Menu.Item key={idx}>
+              {
-              <Link to={i.url}>{i.label}</Link>
+                key: "readyjobs",
-            </Menu.Item>
+                icon: <CheckCircleOutlined />,
-          ))}
+                label: (
-        </Menu.SubMenu>
+                  <Link to="/manage/jobs/ready">
-      </Menu>
+                    {t("menus.header.readyjobs")}
+                  </Link>
+                ),
+              },
+              {
+                key: "parts-queue",
+                icon: <ToolFilled />,
+                label: (
+                  <Link to="/manage/partsqueue">
+                    {t("menus.header.parts-queue")}
+                  </Link>
+                ),
+              },
+              {
+                key: "availablejobs",
+                icon: <ImportOutlined />,
+                label: (
+                  <Link to="/manage/available">
+                    {t("menus.header.availablejobs")}
+                  </Link>
+                ),
+              },
+              {
+                key: "newjob",
+                icon: <FileAddOutlined />,
+                label: (
+                  <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
+                ),
+              },
+              { type: "divider" },
+              {
+                key: "alljobs",
+                icon: <UnorderedListOutlined />,
+                label: (
+                  <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
+                ),
+              },
+              { type: "divider" },
+              {
+                key: "productionlist",
+                icon: <ScheduleOutlined />,
+                label: (
+                  <Link to="/manage/production/list">
+                    {t("menus.header.productionlist")}
+                  </Link>
+                ),
+              },
+              {
+                key: "productionboard",
+                icon: <Icon component={BsKanban} />,
+                label: (
+                  <Link to="/manage/production/board">
+                    {t("menus.header.productionboard")}
+                  </Link>
+                ),
+              },
+              {
+                type: "divider",
+              },
+              {
+                key: "scoreboard",
+                icon: <LineChartOutlined />,
+                label: (
+                  <Link to="/manage/scoreboard">
+                    {t("menus.header.scoreboard")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "customers",
+            icon: <UserOutlined />,
+            label: t("menus.header.customers"),
+            children: [
+              {
+                key: "owners",
+                icon: <TeamOutlined />,
+                label: (
+                  <Link to="/manage/owners">{t("menus.header.owners")}</Link>
+                ),
+              },
+              {
+                key: "vehicles",
+                icon: <CarFilled />,
+                label: (
+                  <Link to="/manage/vehicles">
+                    {t("menus.header.vehicles")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "ccs",
+            icon: <CarFilled />,
+            label: t("menus.header.courtesycars"),
+            children: [
+              {
+                key: "courtesycarsall",
+                icon: <CarFilled />,
+                label: (
+                  <Link to="/manage/courtesycars">
+                    {t("menus.header.courtesycars-all")}
+                  </Link>
+                ),
+              },
+              {
+                key: "contracts",
+                icon: <FileFilled />,
+                label: (
+                  <Link to="/manage/courtesycars/contracts">
+                    {t("menus.header.courtesycars-contracts")}
+                  </Link>
+                ),
+              },
+              {
+                key: "newcontract",
+                icon: <FileAddFilled />,
+                label: (
+                  <Link to="/manage/courtesycars/contracts/new">
+                    {t("menus.header.courtesycars-newcontract")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "accounting",
+            icon: <DollarCircleFilled />,
+            label: t("menus.header.accounting"),
+            children: [
+              {
+                key: "bills",
+                icon: <Icon component={FaFileInvoiceDollar} />,
+                label: (
+                  <Link to="/manage/bills">{t("menus.header.bills")}</Link>
+                ),
+              },
+              {
+                key: "enterbills",
+                icon: <Icon component={GiPayMoney} />,
+                onClick: () => {
+                  setBillEnterContext({
+                    actions: {},
+                    context: {},
+                  });
+                },
+                label: t("menus.header.enterbills"),
+              },
+              ...(Simple_Inventory.treatment === "on"
+                ? [
+                    {
+                      type: "divider",
+                    },
+                    {
+                      key: "inventory",
+                      icon: <Icon component={FaFileInvoiceDollar} />,
+                      label: (
+                        <Link to="/manage/inventory">
+                          {t("menus.header.inventory")}
+                        </Link>
+                      ),
+                    },
+                  ]
+                : []),
+              { type: "divider" },
+              {
+                key: "allpayments",
+                icon: <BankFilled />,
+                label: (
+                  <Link to="/manage/payments">
+                    {t("menus.header.allpayments")}
+                  </Link>
+                ),
+              },
+              {
+                key: "enterpayments",
+                onClick: () => {
+                  setPaymentContext({
+                    actions: {},
+                    context: null,
+                  });
+                },
+                icon: <Icon component={FaCreditCard} />,
+                label: t("menus.header.enterpayment"),
+              },
+              { type: "divider" },
+              {
+                key: "timetickets",
+                icon: <FieldTimeOutlined />,
+                label: (
+                  <Link to="/manage/timetickets">
+                    {t("menus.header.timetickets")}
+                  </Link>
+                ),
+              },
+              {
+                key: "entertimetickets",
+                icon: <Icon component={GiPlayerTime} />,
+                onClick: () => {
+                  setTimeTicketContext({
+                    actions: {},
+                    context: {},
+                  });
+                },
+                label: t("menus.header.entertimeticket"),
+              },
+              { type: "divider" },
+              {
+                key: "accountingexport",
+                icon: <ExportOutlined />,
+
+                label: t("menus.header.export"),
+                children: [
+                  {
+                    key: "receivables",
+                    label: (
+                      <Link to="/manage/accounting/receivables">
+                        {t("menus.header.accounting-receivables")}
+                      </Link>
+                    ),
+                  },
+                  ...(!(
+                    (bodyshop && bodyshop.cdk_dealerid) ||
+                    (bodyshop && bodyshop.pbs_serialnumber)
+                  ) || DmsAp.treatment === "on"
+                    ? [
+                        {
+                          key: "payables",
+                          label: (
+                            <Link to="/manage/accounting/payables">
+                              {t("menus.header.accounting-payables")}
+                            </Link>
+                          ),
+                        },
+                      ]
+                    : []),
+
+                  ...(!(
+                    (bodyshop && bodyshop.cdk_dealerid) ||
+                    (bodyshop && bodyshop.pbs_serialnumber)
+                  )
+                    ? [
+                        {
+                          key: "payments",
+                          label: (
+                            <Link to="/manage/accounting/payments">
+                              {t("menus.header.accounting-payments")}
+                            </Link>
+                          ),
+                        },
+                      ]
+                    : []),
+                  {
+                    key: "export-logs",
+                    label: (
+                      <Link to="/manage/accounting/exportlogs">
+                        {t("menus.header.export-logs")}
+                      </Link>
+                    ),
+                  },
+                ],
+              },
+            ],
+          },
+
+          {
+            key: "phonebook",
+            icon: <PhoneOutlined />,
+            label: (
+              <Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
+            ),
+          },
+          {
+            key: "temporarydocs",
+            icon: <PaperClipOutlined />,
+            label: (
+              <Link to="/manage/temporarydocs">
+                {t("menus.header.temporarydocs")}
+              </Link>
+            ),
+          },
+
+          {
+            key: "shopsubmenu",
+            icon: <SettingOutlined />,
+            label: t("menus.header.shop"),
+            children: [
+              {
+                key: "shop",
+                icon: <Icon component={GiSettingsKnobs} />,
+                label: (
+                  <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
+                ),
+              },
+              {
+                key: "dashboard",
+                icon: <DashboardFilled />,
+                label: (
+                  <Link to="/manage/dashboard">
+                    {t("menus.header.dashboard")}
+                  </Link>
+                ),
+              },
+              {
+                key: "reportcenter",
+                icon: <BarChartOutlined />,
+                onClick: () => {
+                  setReportCenterContext({
+                    actions: {},
+                    context: {},
+                  });
+                },
+                label: t("menus.header.reportcenter"),
+              },
+              {
+                key: "shop-vendors",
+                icon: <Icon component={IoBusinessOutline} />,
+                label: (
+                  <Link to="/manage/shop/vendors">
+                    {t("menus.header.shop_vendors")}
+                  </Link>
+                ),
+              },
+              {
+                key: "shop-csi",
+                icon: <Icon component={RiSurveyLine} />,
+                label: (
+                  <Link to="/manage/shop/csi">
+                    {t("menus.header.shop_csi")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "user",
+            label:
+              currentUser.displayName ||
+              currentUser.email ||
+              t("general.labels.unknown"),
+            children: [
+              {
+                key: "signout",
+                danger: true,
+                onClick: () => signOutStart(),
+                label: t("user.actions.signout"),
+              },
+              {
+                key: "help",
+                icon: <Icon component={QuestionCircleFilled} />,
+                onClick: () => {
+                  window.open("https://help.imex.online/", "_blank");
+                },
+                label: t("menus.header.help"),
+              },
+              {
+                key: "rescue",
+                onClick: () => {
+                  window.open("https://imexrescue.com/", "_blank");
+                },
+                label: t("menus.header.rescueme"),
+              },
+              {
+                key: "shiftclock",
+                label: (
+                  <Link to="/manage/shiftclock">
+                    {t("menus.header.shiftclock")}
+                  </Link>
+                ),
+              },
+              {
+                key: "profile",
+                label: (
+                  <Link to="/manage/profile">
+                    {t("menus.currentuser.profile")}
+                  </Link>
+                ),
+              },
+            ],
+          },
+          {
+            key: "recent",
+            label: <ClockCircleFilled />,
+            children: recentItems.map((i, idx) => ({
+              key: idx,
+              label: <Link to={i.url}>{i.label}</Link>,
+            })),
+          },
+        ]}
+      ></Menu>
     </Layout.Header>
   );
 }

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

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

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

@@ -96,7 +96,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job }) {
   return (
     <>
       <Button onClick={showModal}>{t("printcenter.jobs.3rdpartypayer")}</Button>
-      <Modal visible={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
+      <Modal open={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
         <Form
           onFinish={handleFinish}
           autoComplete={"off"}

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

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

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

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

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

@@ -2,11 +2,9 @@ import { AlertFilled } from "@ant-design/icons";
 import {
   Button,
   Divider,
-  Dropdown,
+  Dropdown, notification,
-  Menu,
-  notification,
   Popover,
-  Space,
+  Space
 } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import moment from "moment";
@@ -18,7 +16,7 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import {
   openChatByPhone,
-  setMessage,
+  setMessage
 } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -27,11 +25,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -149,10 +147,12 @@ export function ScheduleEventComponent({
         ) : null}
         {event.job ? (
           <Dropdown
-            overlay={
+            menu={{
-              <Menu>
+              items: [
-                <Menu.Item
+                {
-                  onClick={() => {
+                  disabled: event.arrived,
+                  label: t("general.labels.email"),
+                  onClick: () => {
                     const Template = TemplateList("job").appointment_reminder;
                     GenerateDocument(
                       {
@@ -166,13 +166,12 @@ export function ScheduleEventComponent({
                       "e",
                       event.job && event.job.id
                     );
-                  }}
+                  },
-                  disabled={event.arrived}
+                },
-                >
+                {
-                  {t("general.labels.email")}
+                  label: t("general.labels.sms"),
-                </Menu.Item>
+                  disabled: event.arrived || !bodyshop.messagingservicesid,
-                <Menu.Item
+                  onClick: () => {
-                  onClick={() => {
                     const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
                     if (p && p.isValid()) {
                       openChatByPhone({
@@ -192,13 +191,10 @@ export function ScheduleEventComponent({
                         message: t("messaging.error.invalidphone"),
                       });
                     }
-                  }}
+                  },
-                  disabled={event.arrived || !bodyshop.messagingservicesid}
+                },
-                >
+              ],
-                  {t("general.labels.sms")}
+            }}
-                </Menu.Item>
-              </Menu>
-            }
           >
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
@@ -249,7 +245,7 @@ export function ScheduleEventComponent({
   const RegularEvent = event.isintake ? (
     <Space
       wrap
-      size='small'
+      size="small"
       style={{
         backgroundColor:
           event.color && event.color.hex ? event.color.hex : event.color,
@@ -287,8 +283,8 @@ export function ScheduleEventComponent({
 
   return (
     <Popover
-      visible={visible}
+      open={visible}
-      onVisibleChange={(vis) => !event.vacation && setVisible(vis)}
+      onOpenChange={(vis) => !event.vacation && setVisible(vis)}
       trigger="click"
       content={event.block ? blockContent : popoverContent}
       style={{

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

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

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

@@ -76,7 +76,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
 
   return (
     <Drawer
-      visible={!!selected}
+      open={!!selected}
       destroyOnClose
       width={drawerPercentage}
       placement="right"

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

@@ -1,24 +1,16 @@
 import {
   DeleteFilled,
+  EditFilled,
   FilterFilled,
+  HomeOutlined,
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
   SyncOutlined,
   WarningFilled,
-  EditFilled,
-  PlusCircleTwoTone,
-  MinusCircleTwoTone,
-  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import {
+import { PageHeader } from '@ant-design/pro-layout';
-  Button,
+import { Button, Dropdown, Input, Space, Table, Tag } from "antd";
-  Dropdown,
-  Input,
-  Menu,
-  PageHeader,
-  Space,
-  Table,
-  Tag,
-} from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -38,13 +30,13 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 // 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 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 { selectBodyshop } from "../../redux/user/user.selectors";
+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 PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
+import JobLinesExpander from "./job-lines-expander.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -103,7 +95,9 @@ export function JobLinesComponent({
       fixed: "left",
       key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
-      onCell: (record) => ({ className: record.manual_line && "job-line-manual" }),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+      }),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
       ellipsis: true,
@@ -405,16 +399,17 @@ export function JobLinesComponent({
     }
   };
 
-  const markMenu = (
+  const markMenu = {
-    <Menu onClick={handleMark}>
+    onClick: handleMark,
-      <Menu.Item key="PAA">{t("joblines.fields.part_types.PAA")}</Menu.Item>
+    items: [
-      <Menu.Item key="PAN">{t("joblines.fields.part_types.PAN")}</Menu.Item>
+      { key: "PAA", label: t("joblines.fields.part_types.PAA") },
-      <Menu.Item key="PAL">{t("joblines.fields.part_types.PAL")}</Menu.Item>
+      { key: "PAN", label: t("joblines.fields.part_types.PAN") },
-      <Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item>
+      { key: "PAL", label: t("joblines.fields.part_types.PAL") },
-      <Menu.Divider />
+      { key: "PAS", label: t("joblines.fields.part_types.PAS") },
-      <Menu.Item key="clear">{t("general.labels.clear")}</Menu.Item>
+      { type: "divider" },
-    </Menu>
+      { key: "clear", label: t("general.labels.clear") },
-  );
+    ],
+  };
 
   return (
     <div>
@@ -544,7 +539,7 @@ export function JobLinesComponent({
             >
               <FilterFilled /> {t("jobs.actions.filterpartsonly")}
             </Button>
-            <Dropdown overlay={markMenu} trigger={["click"]}>
+            <Dropdown menu={markMenu} trigger={["click"]}>
               <Button>{t("jobs.actions.mark")}</Button>
             </Dropdown>
             <Button

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

@@ -87,7 +87,7 @@ export function JobEmployeeAssignments({
   );
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} visible={visibility}>
+    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
       <Spin spinning={loading}>
         <DataLabel label={t("jobs.fields.employee_body")}>
           {body ? (

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

@@ -225,7 +225,7 @@ export function JobLineConvertToLabor({
         <Popover
           disabled={jobline.convertedtolbr}
           content={overlay}
-          visible={visibility}
+          open={visibility}
           placement="bottom"
         >
           <Tooltip title={t("joblines.actions.converttolabor")}>

client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx

@@ -1,5 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -21,19 +21,17 @@ export function JoblinePresetButton({ bodyshop, form }) {
     form.setFieldsValue(item);
   };
 
-  const menu = (
+  const menu = {
-    <Menu>
+    items: bodyshop.md_jobline_presets.map((i, idx) => ({
-      {bodyshop.md_jobline_presets.map((i, idx) => (
+      onClick: () => handleSelect(i),
-        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
+      key: idx,
-          {i.label}
+      label: i.label,
-        </Menu.Item>
+    })),
-      ))}
+  };
-    </Menu>
-  );
 
   return (
     <div>
-      <Dropdown trigger={["click"]} overlay={menu}>
+      <Dropdown trigger={["click"]} menu={menu}>
         <a
           className="ant-dropdown-link"
           href="# "

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -49,7 +49,7 @@ export function JobLinesUpsertModalComponent({
           : t("joblines.labels.new")
       }
       forceRender
-      visible={visible}
+      open={visible}
       width="60%"
       okText={t("general.actions.save")}
       onOk={() => form.submit()}

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

@@ -42,7 +42,7 @@ function JobReconciliationModalContainer({
     <Modal
       title={t("jobs.labels.reconciliationheader")}
       width={"95%"}
-      visible={visible}
+      open={visible}
       okText={t("general.actions.close")}
       onOk={handleCancel}
       onCancel={handleCancel}

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

@@ -186,7 +186,7 @@ export default function ScoreboardAddButton({
   };
 
   return (
-    <Popover content={overlay} visible={visibility} placement="bottom">
+    <Popover content={overlay} open={visibility} placement="bottom">
       <Button
         loading={loading}
         disabled={disabled}

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

@@ -1,6 +1,6 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Dropdown, Menu, notification } from "antd";
+import { Button, Dropdown, notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -40,20 +40,18 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
       });
   };
 
-  const statusmenu = (
+  const statusmenu = {
-    <Menu
+    onClick: (e) => {
-      onClick={(e) => {
+      updateJobStatus(e.key);
-        updateJobStatus(e.key);
+    },
-      }}
+    items: bodyshop.md_ro_statuses.statuses.map((item) => ({
-    >
+      key: item,
-      {bodyshop.md_ro_statuses.statuses.map((item) => (
+      label: item,
-        <Menu.Item key={item}>{item}</Menu.Item>
+    })),
-      ))}
+  };
-    </Menu>
-  );
 
   return (
-    <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
+    <Dropdown menu={statusmenu} trigger={["click"]} key="changestatus">
       <Button shape="round">
         <span>{job.status}</span>
 

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

@@ -1,6 +1,6 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Dropdown, Menu, notification } from "antd";
+import { Button, Dropdown, notification } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -81,29 +81,30 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
     }
   }, [job, setAvailableStatuses, bodyshop]);
 
-  const statusmenu = (
+  const statusmenu = {
-    <Menu
+    onClick: (e) => {
-      onClick={(e) => {
+      updateJobStatus(e.key);
-        updateJobStatus(e.key);
+    },
-      }}
+    items: [
-    >
+      ...availableStatuses.map((item) => ({
-      {availableStatuses.map((item) => (
+        key: item,
-        <Menu.Item key={item}>{item}</Menu.Item>
+        label: item,
-      ))}
+      })),
-      {job.converted && (
+      ...(job.converted && [
-        <>
+        {
-          <Menu.Divider />
+          type: "divider",
-          {otherStages.map((item, idx) => (
+        },
-            <Menu.Item key={item}>{item}</Menu.Item>
+        ...otherStages.map((item, idx) => ({
-          ))}
+          key: item,
-        </>
+          label: item,
-      )}
+        })),
-    </Menu>
+      ]),
-  );
+    ],
+  };
 
   return (
     <Dropdown
-      overlay={statusmenu}
+      menu={statusmenu}
       trigger={["click"]}
       key="changestatus"
       disabled={jobRO || !job.converted}

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -1,4 +1,4 @@
-import { Button, Dropdown, Menu } from "antd";
+import { Button, Dropdown } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -62,18 +62,17 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     );
   };
 
-  const overlay = (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
+  const overlay = {
-    <Menu onClick={handleMenuClick}>
+    onClick: handleMenuClick,
-      {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
+    items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
-        <Menu.Item disabled={disabled} key={mapping.name}>
+      label: mapping.name,
-          {mapping.name}
+      key: mapping.name,
-        </Menu.Item>
+      disabled: disabled,
-      ))}
+    })),
-    </Menu>
+  };
-  );
 
   return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
-    <Dropdown overlay={overlay}>
+    <Dropdown menu={overlay}>
       <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
     </Dropdown>
   ) : (

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

@@ -226,7 +226,7 @@ export function JobsConvertButton({
   if (job.converted) return <></>;
 
   return (
-    <Popover visible={visible} content={popMenu}>
+    <Popover open={visible} content={popMenu}>
       <Button
         key="convert"
         type="danger"

client/src/components/jobs-detail-change-estimator/jobs-detail-change-estimator.component.jsx

@@ -1,5 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,20 +15,17 @@ export function JobsDetailChangeEstimator({ disabled, form, bodyshop }) {
     form.setFieldsValue(est);
   };
 
-  const menu = (
+  const menu = {
-    <div>
+    onClick: handleClick,
-      <Menu onClick={handleClick}>
+    items: bodyshop.md_estimators.map((est, idx) => ({
-        {bodyshop.md_estimators.map((est, idx) => (
+      value: est,
-          <Menu.Item value={est} key={idx}>
+      key: idx,
-            {`${est.est_ct_fn} ${est.est_ct_ln}`}
+      label: `${est.est_ct_fn || ""} ${est.est_ct_ln || ""}`.trim(),
-          </Menu.Item>
+    })),
-        ))}
+  };
-      </Menu>
-    </div>
-  );
 
   return (
-    <Dropdown overlay={menu} disabled={disabled}>
+    <Dropdown menu={menu} disabled={disabled}>
       <a
         className="ant-dropdown-link"
         href=" #"

client/src/components/jobs-detail-change-filehandler/jobs-detail-change-filehandler.component.jsx

@@ -1,5 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,23 +15,21 @@ export function JobsDetailChangeFilehandler({ disabled, form, bodyshop }) {
     form.setFieldsValue(est);
   };
 
-  const menu = (
+  const menu = {
-    <Menu
+    onClick: handleClick,
-      onClick={handleClick}
+    style: {
-      style={{
+      columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
-        columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
+    },
-      }}
+    items: bodyshop.md_filehandlers.map((est, idx) => ({
-    >
+      value: est,
-      {bodyshop.md_filehandlers.map((est, idx) => (
+      key: idx,
-        <Menu.Item value={est} key={idx} style={{ breakInside: "avoid" }}>
+      style: { breakInside: "avoid" },
-          {`${est.ins_ct_fn} ${est.ins_ct_ln}`}
+      label: `${est.ins_ct_fn || ""} ${est.ins_ct_ln || ""}`.trim(),
-        </Menu.Item>
+    })),
-      ))}
+  };
-    </Menu>
-  );
 
   return (
-    <Dropdown overlay={menu} disabled={disabled}>
+    <Dropdown menu={menu} disabled={disabled}>
       <a
         className="ant-dropdown-link"
         href=" #"

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

@@ -4,7 +4,6 @@ import {
   Card,
   Form,
   Input,
-  Menu,
   notification,
   Popover,
   Select,
@@ -13,25 +12,11 @@ import {
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 
-const mapStateToProps = createStructuredSelector({
+export default function JobsDetailHeaderAddEvent({ bodyshop, jobid }) {
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsDetailHeaderAddEvent);
-
-export function JobsDetailHeaderAddEvent({ bodyshop, jobid, ...props }) {
   const { t } = useTranslation();
   const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
 
@@ -153,11 +138,12 @@ export function JobsDetailHeaderAddEvent({ bodyshop, jobid, ...props }) {
     setVisibility(true);
   };
 
-  return (
+  return {
-    <Popover content={overlay} visible={visibility}>
+    key: "addmanualevent",
-      <Menu.Item {...props} onClick={handleClick}>
+    label: (
+      <Popover content={overlay} open={visibility} onClick={handleClick}>
         {t("appointments.labels.manualevent")}
-      </Menu.Item>
+      </Popover>
-    </Popover>
+    ),
-  );
+  };
 }

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

@@ -1,6 +1,6 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Dropdown, Menu, notification, Popconfirm } from "antd";
+import { Button, Dropdown, notification, Popconfirm } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -13,7 +13,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectBodyshop,
-  selectCurrentUser,
+  selectCurrentUser
 } from "../../redux/user/user.selectors";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
@@ -105,13 +105,14 @@ export function JobsDetailHeaderActions({
     });
   };
 
-  const statusmenu = (
+  const statusmenu = {
-    <Menu key="popovermenu">
+    items: [
-      <Menu.Item
+      {
-        disabled={!jobInPreProduction || !job.converted || jobRO}
+        key: "schedule",
-        onClick={() => {
+        disabled: !jobInPreProduction || !job.converted || jobRO,
+        label: t("jobs.actions.schedule"),
+        onClick: () => {
           logImEXEvent("job_header_schedule");
-
           setScheduleContext({
             actions: { refetch: refetch },
             context: {
@@ -120,200 +121,228 @@ export function JobsDetailHeaderActions({
               alt_transport: job.alt_transport,
             },
           });
-        }}
+        },
-      >
+      },
-        {t("jobs.actions.schedule")}
+      {
-      </Menu.Item>
+        key: "cancelappts",
-      <Menu.Item
+        disabled: job.status !== bodyshop.md_ro_statuses.default_scheduled,
-        disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+        label: (
-      >
+          <Popconfirm
-        <Popconfirm
+            title={t("general.labels.areyousure")}
-          title={t("general.labels.areyousure")}
+            okText="Yes"
-          okText="Yes"
+            cancelText="No"
-          cancelText="No"
+            onClick={(e) => e.stopPropagation()}
-          onClick={(e) => e.stopPropagation()}
+            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+            onConfirm={async () => {
-          onConfirm={async () => {
+              const jobUpdate = await cancelAllAppointments({
-            const jobUpdate = await cancelAllAppointments({
+                variables: {
-              variables: {
+                  jobid: job.id,
-                jobid: job.id,
+                  job: {
-                job: {
+                    date_scheduled: null,
-                  date_scheduled: null,
+                    scheduled_in: null,
-                  scheduled_in: null,
+                    scheduled_completion: null,
-                  scheduled_completion: null,
+                    status: bodyshop.md_ro_statuses.default_imported,
-                  status: bodyshop.md_ro_statuses.default_imported,
+                  },
                 },
-              },
-            });
-            if (!jobUpdate.errors) {
-              notification["success"]({
-                message: t("appointments.successes.canceled"),
               });
-              return;
+              if (!jobUpdate.errors) {
-            }
+                notification["success"]({
-          }}
+                  message: t("appointments.successes.canceled"),
-          getPopupContainer={(trigger) => trigger.parentNode}
+                });
-        >
+                return;
-          {t("menus.jobsactions.cancelallappointments")}
+              }
-        </Popconfirm>
+            }}
-      </Menu.Item>
+            getPopupContainer={(trigger) => trigger.parentNode}
-      <Menu.Item
+          >
-        disabled={
+            {t("menus.jobsactions.cancelallappointments")}
+          </Popconfirm>
+        ),
+      },
+      {
+        key: "intake",
+        disabled:
           !!job.intakechecklist ||
           !jobInPreProduction ||
           !job.converted ||
-          jobRO
+          jobRO,
-        }
+        label:
-      >
+          !!job.intakechecklist ||
-        {!!job.intakechecklist ||
+          !jobInPreProduction ||
-        !jobInPreProduction ||
+          !job.converted ||
-        !job.converted ||
+          jobRO ? (
-        jobRO ? (
+            t("jobs.actions.intake")
-          t("jobs.actions.intake")
+          ) : (
-        ) : (
+            <Link to={`/manage/jobs/${job.id}/intake`}>
-          <Link to={`/manage/jobs/${job.id}/intake`}>
+              {t("jobs.actions.intake")}
-            {t("jobs.actions.intake")}
+            </Link>
-          </Link>
+          ),
-        )}
+      },
-      </Menu.Item>
+      {
-      <Menu.Item disabled={!jobInProduction || jobRO}>
+        disabled: !jobInProduction || jobRO,
-        {!jobInProduction ? (
+        key: "deliver",
+        label: !jobInProduction ? (
           t("jobs.actions.deliver")
         ) : (
           <Link to={`/manage/jobs/${job.id}/deliver`}>
             {t("jobs.actions.deliver")}
           </Link>
-        )}
+        ),
-      </Menu.Item>
+      },
-      <Menu.Item disabled={!job.converted}>
+      {
-        <Link to={`/manage/jobs/${job.id}/checklist`}>
+        key: "viewchecklist",
-          {t("jobs.actions.viewchecklist")}
+        disabled: !job.converted,
-        </Link>
+        label: (
-      </Menu.Item>
+          <Link to={`/manage/jobs/${job.id}/checklist`}>
-      <Menu.Item
+            {t("jobs.actions.viewchecklist")}
-        key="entertimetickets"
+          </Link>
-        disabled={
+        ),
+      },
+      {
+        key: "entertimetickets",
+        disabled:
           !job.converted ||
-          (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
+          (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced),
-        }
+        onClick: () => {
-        onClick={() => {
           logImEXEvent("job_header_enter_time_ticekts");
 
           setTimeTicketContext({
             actions: {},
             context: { jobId: job.id },
           });
-        }}
+        },
-      >
+        label: t("timetickets.actions.enter"),
-        {t("timetickets.actions.enter")}
+      },
-      </Menu.Item>
+      {
-      <Menu.Item
+        key: "enterpayments",
-        key="enterpayments"
+        disabled: !job.converted,
-        disabled={!job.converted}
+        label: t("menus.header.enterpayment"),
-        onClick={() => {
+        onClick: () => {
           logImEXEvent("job_header_enter_payment");
 
           setPaymentContext({
             actions: {},
             context: { jobid: job.id },
           });
-        }}
+        },
-      >
+      },
-        {t("menus.header.enterpayment")}
+      {
-      </Menu.Item>
+        key: "cccontract",
-      <Menu.Item key="cccontract" disabled={jobRO || !job.converted}>
+        disabled: jobRO || !job.converted,
-        <Link
+        label: (
-          to={{
+          <Link
-            pathname: "/manage/courtesycars/contracts/new",
+            to={{
-            state: { jobId: job.id },
+              pathname: "/manage/courtesycars/contracts/new",
-          }}
+              state: { jobId: job.id },
-        >
+            }}
-          {t("menus.jobsactions.newcccontract")}
+          >
-        </Link>
+            {t("menus.jobsactions.newcccontract")}
-      </Menu.Item>
+          </Link>
-      {job.inproduction ? (
+        ),
-        <Menu.Item
+      },
-          key="addtoproduction"
+      ...(job.inproduction
-          disabled={!job.converted}
+        ? [
-          onClick={() => AddToProduction(client, job.id, refetch, true)}
+            {
-        >
+              key: "removetoproduction",
-          {t("jobs.actions.removefromproduction")}
+              disabled: !job.converted,
-        </Menu.Item>
+              onClick: () => AddToProduction(client, job.id, refetch, true),
-      ) : (
+              label: t("jobs.actions.removefromproduction"),
-        <Menu.Item
+            },
-          key="addtoproduction"
+          ]
-          disabled={!job.converted}
+        : [
-          onClick={() => AddToProduction(client, job.id, refetch)}
+            {
-        >
+              key: "addtoproduction",
-          {t("jobs.actions.addtoproduction")}
+              disabled: !job.converted,
-        </Menu.Item>
+              onClick: () => AddToProduction(client, job.id, refetch),
-      )}
+              label: t("jobs.actions.addtoproduction"),
-      <Menu.Item key="togglesuspend" onClick={handleSuspend}>
+            },
-        {job.suspended
+          ]),
+      {
+        key: "togglesuspend",
+        onClick: handleSuspend,
+        label: job.suspended
           ? t("production.actions.unsuspend")
-          : t("production.actions.suspend")}
+          : t("production.actions.suspend"),
-      </Menu.Item>
+      },
-      <Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
+      {
-        {job.production_vars && job.production_vars.alert
+        key: "toggleAlert",
-          ? t("production.labels.alertoff")
+        onClick: handleAlertToggle,
-          : t("production.labels.alerton")}
+        label:
-      </Menu.Item>
+          job.production_vars && job.production_vars.alert
-      <Menu.SubMenu key="dupe" title={t("menus.jobsactions.duplicate")}>
+            ? t("production.labels.alertoff")
-        <Menu.Item>
+            : t("production.labels.alerton"),
-          <Popconfirm
+      },
-            title={t("jobs.labels.duplicateconfirm")}
+      {
-            okText="Yes"
+        key: "dupe",
-            cancelText="No"
+        label: t("menus.jobsactions.duplicate"),
-            onClick={(e) => e.stopPropagation()}
+        children: [
-            onConfirm={() =>
+          {
-              DuplicateJob(
+            key: "dupewithlines",
-                client,
+            label: (
-                job.id,
+              <Popconfirm
-                { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
+                title={t("jobs.labels.duplicateconfirm")}
-                (newJobId) => {
+                okText="Yes"
-                  history.push(`/manage/jobs/${newJobId}`);
+                cancelText="No"
-                  notification["success"]({
+                onClick={(e) => e.stopPropagation()}
-                    message: t("jobs.successes.duplicated"),
+                onConfirm={() =>
-                  });
+                  DuplicateJob(
-                },
+                    client,
-                true
+                    job.id,
-              )
+                    {
-            }
+                      defaultOpenStatus:
-            getPopupContainer={(trigger) => trigger.parentNode}
+                        bodyshop.md_ro_statuses.default_imported,
-          >
+                    },
-            {t("menus.jobsactions.duplicate")}
+                    (newJobId) => {
-          </Popconfirm>
+                      history.push(`/manage/jobs/${newJobId}`);
-        </Menu.Item>
+                      notification["success"]({
-        <Menu.Item>
+                        message: t("jobs.successes.duplicated"),
-          <Popconfirm
+                      });
-            title={t("jobs.labels.duplicateconfirm")}
+                    },
-            okText="Yes"
+                    true
-            cancelText="No"
+                  )
-            onClick={(e) => e.stopPropagation()}
-            onConfirm={() =>
-              DuplicateJob(
-                client,
-                job.id,
-                { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
-                (newJobId) => {
-                  history.push(`/manage/jobs/${newJobId}`);
-                  notification["success"]({
-                    message: t("jobs.successes.duplicated"),
-                  });
                 }
-              )
+                getPopupContainer={(trigger) => trigger.parentNode}
-            }
+              >
-            getPopupContainer={(trigger) => trigger.parentNode}
+                {t("menus.jobsactions.duplicate")}
-          >
+              </Popconfirm>
-            {t("menus.jobsactions.duplicatenolines")}
+            ),
-          </Popconfirm>
+          },
-        </Menu.Item>
+          {
-      </Menu.SubMenu>
+            key: "dupewithoutlines",
-
+            label: (
-      <Menu.Item
+              <Popconfirm
-        key="postbills"
+                title={t("jobs.labels.duplicateconfirm")}
-        disabled={!job.converted}
+                okText="Yes"
-        onClick={() => {
+                cancelText="No"
+                onClick={(e) => e.stopPropagation()}
+                onConfirm={() =>
+                  DuplicateJob(
+                    client,
+                    job.id,
+                    {
+                      defaultOpenStatus:
+                        bodyshop.md_ro_statuses.default_imported,
+                    },
+                    (newJobId) => {
+                      history.push(`/manage/jobs/${newJobId}`);
+                      notification["success"]({
+                        message: t("jobs.successes.duplicated"),
+                      });
+                    }
+                  )
+                }
+                getPopupContainer={(trigger) => trigger.parentNode}
+              >
+                {t("menus.jobsactions.duplicatenolines")}
+              </Popconfirm>
+            ),
+          },
+        ],
+      },
+      {
+        key: "postbills",
+        disabled: !job.converted,
+        label: t("jobs.actions.postbills"),
+        onClick: () => {
           logImEXEvent("job_header_enter_bills");
 
           setBillEnterContext({
@@ -322,14 +351,13 @@ export function JobsDetailHeaderActions({
               job: job,
             },
           });
-        }}
+        },
-      >
+      },
-        {t("jobs.actions.postbills")}
+      {
-      </Menu.Item>
+        key: "addtopartsqueue",
-      <Menu.Item
+        disabled: !job.converted || !jobInProduction || jobRO,
-        key="addtopartsqueue"
+        label: t("jobs.actions.addtopartsqueue"),
-        disabled={!job.converted || !jobInProduction || jobRO}
+        onClick: async () => {
-        onClick={async () => {
           const result = await updateJob({
             variables: {
               jobId: job.id,
@@ -348,12 +376,12 @@ export function JobsDetailHeaderActions({
               }),
             });
           }
-        }}
+        },
-      >
+      },
-        {t("jobs.actions.addtopartsqueue")}
+      {
-      </Menu.Item>
+        disabled: !jobInPostProduction,
-      <Menu.Item disabled={!jobInPostProduction} key="closejob">
+        key: "closejob",
-        {!jobInPostProduction ? (
+        label: !jobInPostProduction ? (
           t("menus.jobsactions.closejob")
         ) : (
           <Link
@@ -363,23 +391,27 @@ export function JobsDetailHeaderActions({
           >
             {t("menus.jobsactions.closejob")}
           </Link>
-        )}
+        ),
-      </Menu.Item>
+      },
-      <Menu.Item key="admin">
+      {
-        <Link
+        key: "admin",
-          to={{
+        label: (
-            pathname: `/manage/jobs/${job.id}/admin`,
+          <Link
-          }}
+            to={{
-        >
+              pathname: `/manage/jobs/${job.id}/admin`,
-          {t("menus.jobsactions.admin")}
+            }}
-        </Link>
+          >
-      </Menu.Item>
+            {t("menus.jobsactions.admin")}
-      <JobsDetailHeaderActionsExportcustdataComponent job={job} />
+          </Link>
-      <JobsDetaiLheaderCsi job={job} />
+        ),
-      <Menu.Item
+      },
-        key="jobcosting"
+      JobsDetailHeaderActionsExportcustdataComponent({ bodyshop, job }),
-        disabled={!job.converted}
+      JobsDetaiLheaderCsi({ job, bodyshop }),
-        onClick={() => {
+      {
+        key: "jobcosting",
+        label: t("jobs.labels.jobcosting"),
+        disabled: !job.converted,
+        onClick: () => {
           logImEXEvent("job_header_job_costing");
           setJobCostingContext({
             actions: { refetch: refetch },
@@ -387,96 +419,108 @@ export function JobsDetailHeaderActions({
               jobId: job.id,
             },
           });
-        }}
+        },
-      >
+      },
-        {t("jobs.labels.jobcosting")}
+      ...(job && !job.converted
-      </Menu.Item>
+        ? [
-      {job && !job.converted && (
+            {
-        <Menu.Item>
+              key: "deletejob",
-          <Popconfirm
+              label: (
-            title={t("jobs.labels.deleteconfirm")}
+                <Popconfirm
-            okText={t("general.labels.yes")}
+                  title={t("jobs.labels.deleteconfirm")}
-            cancelText={t("general.labels.no")}
+                  okText={t("general.labels.yes")}
-            onClick={(e) => e.stopPropagation()}
+                  cancelText={t("general.labels.no")}
-            onConfirm={async () => {
+                  onClick={(e) => e.stopPropagation()}
-              //delete the job.
+                  onConfirm={async () => {
-              const result = await deleteJob({ variables: { id: job.id } });
+                    //delete the job.
+                    const result = await deleteJob({
+                      variables: { id: job.id },
+                    });
 
-              if (!!!result.errors) {
+                    if (!!!result.errors) {
-                notification["success"]({
+                      notification["success"]({
-                  message: t("jobs.successes.delete"),
+                        message: t("jobs.successes.delete"),
-                });
+                      });
-                //go back to jobs list.
+                      //go back to jobs list.
-                history.push(`/manage/`);
+                      history.push(`/manage/`);
-              } else {
+                    } else {
-                notification["error"]({
+                      notification["error"]({
-                  message: t("jobs.errors.deleted", {
+                        message: t("jobs.errors.deleted", {
-                    error: JSON.stringify(result.errors),
+                          error: JSON.stringify(result.errors),
-                  }),
+                        }),
-                });
+                      });
-              }
+                    }
-            }}
+                  }}
-            getPopupContainer={(trigger) => trigger.parentNode}
+                  getPopupContainer={(trigger) => trigger.parentNode}
-          >
+                >
-            {t("menus.jobsactions.deletejob")}
+                  {t("menus.jobsactions.deletejob")}
-          </Popconfirm>
+                </Popconfirm>
-        </Menu.Item>
+              ),
-      )}
+            },
-      <JobsDetailHeaderActionsAddevent jobid={job.id} />
+          ]
-      {!jobRO && job.converted && (
+        : []),
-        <Menu.Item>
+      ///////HEADER ADD EVENT ITEM
-          <Popconfirm
+      JobsDetailHeaderActionsAddevent({ jobid: job.id, bodyshop }),
-            title={t("jobs.labels.voidjob")}
+      ...(!jobRO && job.converted
-            okText="Yes"
+        ? [
-            cancelText="No"
+            {
-            onClick={(e) => e.stopPropagation()}
+              key: "voidjob",
-            onConfirm={async () => {
+              label: (
-              //delete the job.
+                <Popconfirm
-              const result = await voidJob({
+                  title={t("jobs.labels.voidjob")}
-                variables: {
+                  okText="Yes"
-                  jobId: job.id,
+                  cancelText="No"
-                  job: {
+                  onClick={(e) => e.stopPropagation()}
-                    status: bodyshop.md_ro_statuses.default_void,
+                  onConfirm={async () => {
-                    voided: true,
+                    //delete the job.
-                    scheduled_in: null,
+                    const result = await voidJob({
-                    scheduled_completion: null,
+                      variables: {
-                    inproduction: false,
+                        jobId: job.id,
-                  },
+                        job: {
-                  note: [
+                          status: bodyshop.md_ro_statuses.default_void,
-                    {
+                          voided: true,
-                      jobid: job.id,
+                          scheduled_in: null,
-                      created_by: currentUser.email,
+                          scheduled_completion: null,
-                      audit: true,
+                          inproduction: false,
-                      text: t("jobs.labels.voidnote"),
+                        },
-                    },
+                        note: [
-                  ],
+                          {
-                },
+                            jobid: job.id,
-              });
+                            created_by: currentUser.email,
+                            audit: true,
+                            text: t("jobs.labels.voidnote"),
+                          },
+                        ],
+                      },
+                    });
+
+                    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),
+                        }),
+                      });
+                    }
+                  }}
+                  getPopupContainer={(trigger) => trigger.parentNode}
+                >
+                  {t("menus.jobsactions.void")}
+                </Popconfirm>
+              ),
+            },
+          ]
+        : []),
+    ],
+  };
 
-              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),
-                  }),
-                });
-              }
-            }}
-            getPopupContainer={(trigger) => trigger.parentNode}
-          >
-            {t("menus.jobsactions.void")}
-          </Popconfirm>
-        </Menu.Item>
-      )}
-    </Menu>
-  );
   return (
-    <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
+    <Dropdown menu={statusmenu} trigger={["click"]} key="changestatus">
       <Button>
         <span>{t("general.labels.actions")}</span>
 

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

@@ -1,11 +1,8 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Menu, notification } from "antd";
+import { notification } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 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 { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   GET_CURRENT_QUESTIONSET_ID,
@@ -16,30 +13,14 @@ import {
   openChatByPhone,
   setMessage,
 } from "../../redux/messaging/messaging.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { store } from "../../redux/store";
+import i18n from "../../translations/i18n";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
-const mapStateToProps = createStructuredSelector({
+export default function JobsDetailHeaderCsi({ bodyshop, job }) {
-  //currentUser: selectCurrentUser'
+  const { t } = i18n;
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
-  setMessage: (text) => dispatch(setMessage(text)),
-});
-
-export function JobsDetailHeaderCsi({
-  setEmailOptions,
-  bodyshop,
-  job,
-  openChatByPhone,
-  setMessage,
-  ...props
-}) {
-  const { t } = useTranslation();
   const [insertCsi] = useMutation(INSERT_CSI);
   const client = useApolloClient();
 
@@ -97,29 +78,35 @@ export function JobsDetailHeaderCsi({
           return;
         }
         if (e.key === "email")
-          setEmailOptions({
+          store.dispatch(
-            jobid: job.id,
+            setEmailOptions({
-            messageOptions: {
+              jobid: job.id,
-              to: [job.ownr_ea],
+              messageOptions: {
-              replyTo: bodyshop.email,
+                to: [job.ownr_ea],
-            },
+                replyTo: bodyshop.email,
-            template: {
-              name: TemplateList("job_special").csi_invitation_action.key,
-              variables: {
-                id: result.data.insert_csi.returning[0].id,
               },
-            },
+              template: {
-          });
+                name: TemplateList("job_special").csi_invitation_action.key,
+                variables: {
+                  id: result.data.insert_csi.returning[0].id,
+                },
+              },
+            })
+          );
 
         if (e.key === "text") {
           const p = parsePhoneNumber(job.ownr_ph1, "CA");
           if (p && p.isValid()) {
-            openChatByPhone({
+            store.dispatch(
-              phone_num: p.formatInternational(),
+              openChatByPhone({
-              jobid: job.id,
+                phone_num: p.formatInternational(),
-            });
+                jobid: job.id,
-            setMessage(
+              })
-              `${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
+            );
+            store.dispatch(
+              setMessage(
+                `${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
+              )
             );
           } else {
             notification["error"]({
@@ -140,29 +127,35 @@ export function JobsDetailHeaderCsi({
       }
     } else {
       if (e.key === "email")
-        setEmailOptions({
+        store.dispatch(
-          jobid: job.id,
+          setEmailOptions({
-          messageOptions: {
+            jobid: job.id,
-            to: [job.ownr_ea],
+            messageOptions: {
-            replyTo: bodyshop.email,
+              to: [job.ownr_ea],
-          },
+              replyTo: bodyshop.email,
-          template: {
-            name: TemplateList("job_special").csi_invitation_action.key,
-            variables: {
-              id: job.csiinvites[0].id,
             },
-          },
+            template: {
-        });
+              name: TemplateList("job_special").csi_invitation_action.key,
+              variables: {
+                id: job.csiinvites[0].id,
+              },
+            },
+          })
+        );
 
       if (e.key === "text") {
         const p = parsePhoneNumber(job.ownr_ph1, "CA");
         if (p && p.isValid()) {
-          openChatByPhone({
+          store.dispatch(
-            phone_num: p.formatInternational(),
+            openChatByPhone({
-            jobid: job.id,
+              phone_num: p.formatInternational(),
-          });
+              jobid: job.id,
-          setMessage(
+            })
-            `${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`
+          );
+          store.dispatch(
+            setMessage(
+              `${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`
+            )
           );
         } else {
           notification["error"]({
@@ -180,61 +173,51 @@ export function JobsDetailHeaderCsi({
     }
   };
 
-  if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return <></>;
+  if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return {};
 
-  return (
+  return {
-    <Menu.SubMenu
+    key: "sendcsi",
-      key="sendcsi"
+    label: t("jobs.actions.sendcsi"),
-      title={t("jobs.actions.sendcsi")}
+    children: [
-      disabled={!job.converted}
+      {
-      {...props}
+        key: "email",
-    >
+        onClick: handleCreateCsi,
-      <Menu.Item
+        disabled: !!!job.ownr_ea,
-        onClick={handleCreateCsi}
+        label: t("general.labels.email"),
-        key="email"
+      },
-        disabled={!!!job.ownr_ea}
+      {
-      >
+        onClick: handleCreateCsi,
-        {t("general.labels.email")}
+        key: "text",
-      </Menu.Item>
+        disabled: !!!job.ownr_ph1,
-      <Menu.Item
+        label: t("general.labels.text"),
-        onClick={handleCreateCsi}
+      },
-        key="text"
+      {
-        disabled={!!!job.ownr_ph1}
+        key: "generate",
-      >
+        onClick: handleCreateCsi,
-        {t("general.labels.text")}
+        disabled: job.csiinvites && job.csiinvites.length > 0,
-      </Menu.Item>
+        label: t("jobs.actions.generatecsi"),
-      <Menu.Item
+      },
-        onClick={handleCreateCsi}
+      { type: "divider" },
-        key="generate"
+      ...job.csiinvites.map((item, idx) => {
-        disabled={job.csiinvites && job.csiinvites.length > 0}
+        return item.completedon
-      >
+          ? {
-        {t("jobs.actions.generatecsi")}
+              key: idx,
-      </Menu.Item>
+              label: (
-      <Menu.Divider />
+                <Link to={`/manage/shop/csi?responseid=${item.id}`}>
-      {job.csiinvites.map((item, idx) => {
+                  <DateTimeFormatter>{item.completedon}</DateTimeFormatter>
-        return item.completedon ? (
+                </Link>
-          <Menu.Item key={idx}>
+              ),
-            <Link to={`/manage/shop/csi?responseid=${item.id}`}>
+            }
-              <DateTimeFormatter>{item.completedon}</DateTimeFormatter>
+          : {
-            </Link>
+              key: idx,
-          </Menu.Item>
+              onClick: () => {
-        ) : (
+                navigator.clipboard.writeText(
-          <Menu.Item
+                  `${window.location.protocol}//${window.location.host}/csi/${item.id}`
-            key={idx}
+                );
-            onClick={() => {
+              },
-              navigator.clipboard.writeText(
+              label: t("general.actions.copylink"),
-                `${window.location.protocol}//${window.location.host}/csi/${item.id}`
+            };
-              );
+      }),
-            }}
+    ],
-          >
+  };
-            {t("general.actions.copylink")}
-          </Menu.Item>
-        );
-      })}
-    </Menu.SubMenu>
-  );
 }
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsDetailHeaderCsi);

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

@@ -1,23 +1,13 @@
-import { Menu, notification } from "antd";
+import { notification } from "antd";
 import axios from "axios";
-import React from "react";
+import i18next from "i18next";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 
-const mapStateToProps = createStructuredSelector({
+export default function JobsDetailHeaderActionexportCustomerData({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({});
-
-export function JobsDetailHeaderActionexportCustomerData({
   bodyshop,
   job,
-  ...props
 }) {
-  const { t } = useTranslation();
+  const { t } = i18next;
 
   const handleExportCustData = async (e) => {
     logImEXEvent("job_export_cust_data");
@@ -100,18 +90,20 @@ export function JobsDetailHeaderActionexportCustomerData({
     }
   };
 
-  return (
+  return {
-    <Menu.Item
+    onClick: handleExportCustData,
-      {...props}
+    key: "exportcustdata",
-      onClick={handleExportCustData}
+    disabled: !job.converted,
-      key="exportcustdata"
+    label: t("jobs.actions.exportcustdata"),
-      disabled={!job.converted}
+  };
-    >
+  // (
-      {t("jobs.actions.exportcustdata")}
+  //   <Menu.Item
-    </Menu.Item>
+  //     {...props}
-  );
+  //     onClick={handleExportCustData}
+  //     key="exportcustdata"
+  //     disabled={!job.converted}
+  //   >
+  //     {t("jobs.actions.exportcustdata")}
+  //   </Menu.Item>
+  // );
 }
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsDetailHeaderActionexportCustomerData);

client/src/components/jobs-detail-rates-change-button/jobs-detail-rates-change-button.component.jsx

@@ -1,5 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -18,20 +18,16 @@ export function JobsDetailRatesChangeButton({ disabled, form, bodyshop }) {
     form.setFieldsValue({ ...rate, labor_rate_desc: rate.rate_label });
   };
 
-  const menu = (
+  const menu = {
-    <div>
+    onClick: handleClick,
-      <Menu onClick={handleClick}>
+    items: bodyshop.md_labor_rates.map((rate, idx) => ({
-        {bodyshop.md_labor_rates.map((rate, idx) => (
+      key: idx,
-          <Menu.Item value={rate} key={idx}>
+      value: rate,
-            {rate.rate_label}
+      label: rate.rate_label,
-          </Menu.Item>
+    })),
-        ))}
+  };
-      </Menu>
-    </div>
-  );
-
   return (
-    <Dropdown overlay={menu} disabled={disabled}>
+    <Dropdown menu={menu} disabled={disabled}>
       <a
         className="ant-dropdown-link"
         href=" #"

client/src/components/jobs-documents-gallery/jobs-document-gallery.download.component.jsx

@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import cleanAxios from "../../utils/CleanAxios";
 import formatBytes from "../../utils/formatbytes";
-import yauzl from "yauzl";
+//import yauzl from "yauzl";
 import { useTreatments } from "@splitsoftware/splitio-react";
 
 import { connect } from "react-redux";
@@ -36,7 +36,7 @@ export function JobsDocumentsDownloadButton({
   );
   const imagesToDownload = [
     ...galleryImages.images.filter((image) => image.isSelected),
-     ...galleryImages.other.filter((image) => image.isSelected),
+    ...galleryImages.other.filter((image) => image.isSelected),
   ];
 
   function downloadProgress(progressEvent) {
@@ -69,44 +69,42 @@ export function JobsDocumentsDownloadButton({
     setDownload(null);
     if (Direct_Media_Download.treatment === "on") {
       try {
-        const parentDir = await window.showDirectoryPicker({
+        // const parentDir = await window.showDirectoryPicker({
-          id: "media",
+        //   id: "media",
-          startIn: "downloads",
+        //   startIn: "downloads",
-        });
+        // });
-
+        // const directory = await parentDir.getDirectoryHandle(identifier, {
-        const directory = await parentDir.getDirectoryHandle(identifier, {
+        //   create: true,
-          create: true,
+        // });
-        });
+        // yauzl.fromBuffer(
-
+        //   Buffer.from(theDownloadedZip.data),
-        yauzl.fromBuffer(
+        //   {},
-          Buffer.from(theDownloadedZip.data),
+        //   (err, zipFile) => {
-          {},
+        //     if (err) throw err;
-          (err, zipFile) => {
+        //     zipFile.on("entry", (entry) => {
-            if (err) throw err;
+        //       zipFile.openReadStream(entry, async (readErr, readStream) => {
-            zipFile.on("entry", (entry) => {
+        //         if (readErr) {
-              zipFile.openReadStream(entry, async (readErr, readStream) => {
+        //           zipFile.close();
-                if (readErr) {
+        //           throw readErr;
-                  zipFile.close();
+        //         }
-                  throw readErr;
+        //         if (err) throw err;
-                }
+        //         let fileSystemHandle = await directory.getFileHandle(
-                if (err) throw err;
+        //           entry.fileName,
-                let fileSystemHandle = await directory.getFileHandle(
+        //           {
-                  entry.fileName,
+        //             create: true,
-                  {
+        //           }
-                    create: true,
+        //         );
-                  }
+        //         const writable = await fileSystemHandle.createWritable();
-                );
+        //         readStream.on("data", async function (chunk) {
-                const writable = await fileSystemHandle.createWritable();
+        //           await writable.write(chunk);
-                readStream.on("data", async function (chunk) {
+        //         });
-                  await writable.write(chunk);
+        //         readStream.on("end", async function () {
-                });
+        //           await writable.close();
-                readStream.on("end", async function () {
+        //         });
-                  await writable.close();
+        //       });
-                });
+        //     });
-              });
+        //   }
-            });
+        // );
-          }
-        );
       } catch (e) {
         console.log(e);
         standardMediaDownload(theDownloadedZip.data);
@@ -123,7 +121,7 @@ export function JobsDocumentsDownloadButton({
       a.click();
     }
   };
- 
+
   return (
     <>
       <Button

client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx

@@ -159,7 +159,7 @@ export function JobsDocumentsGalleryReassign({
   );
 
   return (
-    <Popover content={popContent} visible={visible}>
+    <Popover content={popContent} open={visible}>
       <Button
         disabled={selectedImages.length < 1}
         onClick={() => setVisible(true)}

client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx

@@ -1,7 +1,7 @@
 import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Col, Row, Space } from "antd";
 import React, { useEffect, useState } from "react";
-import Gallery from "react-grid-gallery";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import DocumentsUploadComponent from "../documents-upload/documents-upload.component";
 import { DetermineFileType } from "../documents-upload/documents-upload.utility";
@@ -10,7 +10,8 @@ import JobsDocumentsDownloadButton from "./jobs-document-gallery.download.compon
 import JobsDocumentsGalleryReassign from "./jobs-document-gallery.reassign.component";
 import JobsDocumentsDeleteButton from "./jobs-documents-gallery.delete.component";
 import JobsDocumentsGallerySelectAllComponent from "./jobs-documents-gallery.selectall.component";
-
+import Lightbox from "react-image-lightbox";
+import "react-image-lightbox/style.css";
 function JobsDocumentsComponent({
   data,
   jobId,
@@ -23,11 +24,7 @@ function JobsDocumentsComponent({
 }) {
   const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
   const { t } = useTranslation();
-  const [index, setIndex] = useState(0);
+  const [modalState, setModalState] = useState({ open: false, index: 0 });
-
-  const onCurrentImageChange = (index) => {
-    setIndex(index);
-  };
 
   useEffect(() => {
     let documents = data.reduce(
@@ -35,10 +32,12 @@ function JobsDocumentsComponent({
         const fileType = DetermineFileType(value.type);
         if (value.type.startsWith("image")) {
           acc.images.push({
-            src: GenerateSrcUrl(value),
+            // src: GenerateSrcUrl(value),
-            thumbnail: GenerateThumbUrl(value),
+            // thumbnail: GenerateThumbUrl(value),
-            thumbnailHeight: 225,
+            fullsize: GenerateSrcUrl(value),
-            thumbnailWidth: 225,
+            src: GenerateThumbUrl(value),
+            height: 225,
+            width: 225,
             isSelected: false,
             key: value.key,
             extension: value.extension,
@@ -62,8 +61,8 @@ function JobsDocumentsComponent({
           const fileName = value.key.split("/").pop();
           acc.other.push({
             source: GenerateSrcUrl(value),
-            src: "",
+            //src: "",
-            thumbnail: thumb,
+            src: thumb,
             tags: [
               {
                 value: fileName,
@@ -85,8 +84,8 @@ function JobsDocumentsComponent({
                   ]
                 : []),
             ],
-            thumbnailHeight: 225,
+            height: 225,
-            thumbnailWidth: 225,
+            width: 225,
             isSelected: false,
 
             extension: value.extension,
@@ -148,35 +147,15 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-images")}>
             <Gallery
               images={galleryImages.images}
-              backdropClosesModal={true}
+              onClick={(index, item) => {
-              currentImageWillChange={onCurrentImageChange}
+                setModalState({ open: true, index: index });
-              customControls={[
+                // window.open(
-                <Button
+                //   item.fullsize,
-                  key="edit-button"
+                //   "_blank",
-                  style={{
+                //   "toolbar=0,location=0,menubar=0"
-                    float: "right",
+                // );
-                    zIndex: "5",
-                  }}
-                  onClick={() => {
-                    const newWindow = window.open(
-                      `${window.location.protocol}//${window.location.host}/edit?documentId=${galleryImages.images[index].id}`,
-                      "_blank",
-                      "noopener,noreferrer"
-                    );
-                    if (newWindow) newWindow.opener = null;
-                  }}
-                >
-                  <EditFilled />
-                </Button>,
-              ]}
-              onClickImage={(props) => {
-                window.open(
-                  props.target.src,
-                  "_blank",
-                  "toolbar=0,location=0,menubar=0"
-                );
               }}
-              onSelectImage={(index, image) => {
+              onSelect={(index, image) => {
                 setgalleryImages({
                   ...galleryImages,
                   images: galleryImages.images.map((g, idx) =>
@@ -191,8 +170,6 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-other")}>
             <Gallery
               images={galleryImages.other}
-              backdropClosesModal={true}
-              enableLightbox={false}
               thumbnailStyle={() => {
                 return {
                   backgroundImage: <FileExcelFilled />,
@@ -201,14 +178,14 @@ function JobsDocumentsComponent({
                   cursor: "pointer",
                 };
               }}
-              onClickThumbnail={(index) => {
+              onClick={(index) => {
                 window.open(
                   galleryImages.other[index].source,
                   "_blank",
                   "toolbar=0,location=0,menubar=0"
                 );
               }}
-              onSelectImage={(index) => {
+              onSelect={(index) => {
                 setgalleryImages({
                   ...galleryImages,
                   other: galleryImages.other.map((g, idx) =>
@@ -220,6 +197,53 @@ function JobsDocumentsComponent({
           </Card>
         </Col>
       </Row>
+      {modalState.open && (
+        <Lightbox
+          toolbarButtons={[
+            <EditFilled
+              onClick={() => {
+                const newWindow = window.open(
+                  `${window.location.protocol}//${
+                    window.location.host
+                  }/edit?documentId=${
+                    galleryImages.images[modalState.index].id
+                  }`,
+                  "_blank",
+                  "noopener,noreferrer"
+                );
+                if (newWindow) newWindow.opener = null;
+              }}
+            />,
+          ]}
+          mainSrc={galleryImages.images[modalState.index].fullsize}
+          nextSrc={
+            galleryImages.images[
+              (modalState.index + 1) % galleryImages.images.length
+            ].fullsize
+          }
+          prevSrc={
+            galleryImages.images[
+              (modalState.index + galleryImages.images.length - 1) %
+                galleryImages.images.length
+            ].fullsize
+          }
+          onCloseRequest={() => setModalState({ open: false, index: 0 })}
+          onMovePrevRequest={() =>
+            setModalState({
+              ...modalState,
+              index:
+                (modalState.index + galleryImages.images.length - 1) %
+                galleryImages.images.length,
+            })
+          }
+          onMoveNextRequest={() =>
+            setModalState({
+              ...modalState,
+              index: (modalState.index + 1) % galleryImages.images.length,
+            })
+          }
+        />
+      )}
     </div>
   );
 }

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -1,7 +1,7 @@
 import { SyncOutlined, FileExcelFilled } from "@ant-design/icons";
 import { Alert, Button, Card, Space } from "antd";
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
-import Gallery from "react-grid-gallery";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -18,6 +18,8 @@ import JobsDocumentsLocalDeleteButton from "./jobs-documents-local-gallery.delet
 import JobsLocalGalleryDownloadButton from "./jobs-documents-local-gallery.download";
 import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
 import JobsDocumentsLocalGallerySelectAllComponent from "./jobs-documents-local-gallery.selectall.component";
+import Lightbox from "react-image-lightbox";
+import "react-image-lightbox/style.css";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -49,6 +51,7 @@ export function JobsDocumentsLocalGallery({
   vendorid,
 }) {
   const { t } = useTranslation();
+  const [modalState, setModalState] = useState({ open: false, index: 0 });
   useEffect(() => {
     if (job) {
       if (invoice_number) {
@@ -58,6 +61,7 @@ export function JobsDocumentsLocalGallery({
       }
     }
   }, [job, invoice_number, getJobMedia, getBillMedia]);
+
   let optimized;
   const jobMedia =
     allMedia && allMedia[job.id]
@@ -70,12 +74,20 @@ export function JobsDocumentsLocalGallery({
             ) {
               acc.images.push({
                 ...val,
+                fullsize: val.src,
+                src: val.thumbnail,
+                height: val.thumbnailHeight,
+                width: val.thumbnailWidth,
                 ...(val.optimized && { src: val.optimized, fullsize: val.src }),
               });
               if (val.optimized) optimized = true;
             } else {
               acc.other.push({
                 ...val,
+                fullsize: val.src,
+                src: val.thumbnail,
+                height: val.thumbnailHeight,
+                width: val.thumbnailWidth,
                 tags: [{ value: val.filename, title: val.filename }],
               });
             }
@@ -120,8 +132,7 @@ export function JobsDocumentsLocalGallery({
       <Card title={t("jobs.labels.documents-images")}>
         <Gallery
           images={jobMedia.images}
-          backdropClosesModal={true}
+          onSelect={(index, image) => {
-          onSelectImage={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
           {...(optimized && {
@@ -133,24 +144,23 @@ export function JobsDocumentsLocalGallery({
               />,
             ],
           })}
-          onClickImage={(props) => {
+          onClick={(index, item) => {
-            const media = allMedia[job.id].find(
+            setModalState({ open: true, index: index });
-              (m) => m.optimized === props.target.src
+            // const media = allMedia[job.id].find(
-            );
+            //   (m) => m.optimized === item.src
+            // );
 
-            window.open(
+            // window.open(
-              media ? media.src : props.target.src,
+            //   media ? media.fullsize : item.fullsize,
-              "_blank",
+            //   "_blank",
-              "toolbar=0,location=0,menubar=0"
+            //   "toolbar=0,location=0,menubar=0"
-            );
+            // );
           }}
         />
       </Card>
       <Card title={t("jobs.labels.documents-other")}>
         <Gallery
           images={jobMedia.other}
-          backdropClosesModal={true}
-          enableLightbox={false}
           thumbnailStyle={() => {
             return {
               backgroundImage: <FileExcelFilled />,
@@ -159,18 +169,48 @@ export function JobsDocumentsLocalGallery({
               cursor: "pointer",
             };
           }}
-          onClickThumbnail={(index) => {
+          onClick={(index) => {
             window.open(
-              jobMedia.other[index].src,
+              jobMedia.other[index].fullsize,
               "_blank",
               "toolbar=0,location=0,menubar=0"
             );
           }}
-          onSelectImage={(index, image) => {
+          onSelect={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
         />
       </Card>
+      {modalState.open && (
+        <Lightbox
+          mainSrc={jobMedia.images[modalState.index].fullsize}
+          nextSrc={
+            jobMedia.images[(modalState.index + 1) % jobMedia.images.length]
+              .fullsize
+          }
+          prevSrc={
+            jobMedia.images[
+              (modalState.index + jobMedia.images.length - 1) %
+                jobMedia.images.length
+            ].fullsize
+          }
+          onCloseRequest={() => setModalState({ open: false, index: 0 })}
+          onMovePrevRequest={() =>
+            setModalState({
+              ...modalState,
+              index:
+                (modalState.index + jobMedia.images.length - 1) %
+                jobMedia.images.length,
+            })
+          }
+          onMoveNextRequest={() =>
+            setModalState({
+              ...modalState,
+              index: (modalState.index + 1) % jobMedia.images.length,
+            })
+          }
+        />
+      )}
     </div>
   );
 }

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import Gallery from "react-grid-gallery";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -38,7 +38,7 @@ function JobDocumentsLocalGalleryExternal({
   const { t } = useTranslation();
 
   useEffect(() => {
-    if ( jobId) {
+    if (jobId) {
       getJobMedia(jobId);
     }
   }, [jobId, getJobMedia]);
@@ -52,7 +52,7 @@ function JobDocumentsLocalGalleryExternal({
               val.type.mime &&
               val.type.mime.startsWith("image")
             ) {
-              acc.push(val);
+              acc.push({ ...val, src: val.thumbnail });
             }
             return acc;
           }, [])
@@ -65,7 +65,6 @@ function JobDocumentsLocalGalleryExternal({
     <div className="clearfix">
       <Gallery
         images={galleryImages}
-        backdropClosesModal={true}
         onSelectImage={(index, image) => {
           setgalleryImages(
             galleryImages.map((g, idx) =>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx

@@ -83,7 +83,7 @@ export function JobsDocumentsLocalGalleryReassign({
   );
 
   return (
-    <Popover content={popContent} visible={visible}>
+    <Popover content={popContent} open={visible}>
       <Button
         //disabled={selectedImages.length < 1}
         onClick={() => setVisible(true)}

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

@@ -171,8 +171,8 @@ export function LaborAllocationsAdjustmentEdit({
 
   return (
     <Popover
-      visible={visible}
+      open={visible}
-      onVisibleChange={(vis) => setVisible(vis)}
+      onOpenChange={(vis) => setVisible(vis)}
       content={overlay}
       trigger="click"
     >

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

@@ -117,7 +117,7 @@ export function NoteUpsertModalContainer({
   return (
     <Modal
       title={existingNote ? t("notes.actions.edit") : t("notes.actions.new")}
-      visible={visible}
+      open={visible}
       okText={t("general.actions.save")}
       onOk={() => {
         form.submit();

client/src/components/notes-preset-button/notes-preset-button.component.jsx

@@ -1,5 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -21,27 +21,21 @@ export function NotesPresetButton({ bodyshop, form }) {
     form.setFieldsValue({ text: item.text });
   };
 
-  const menu = (
+  const menu = {
-    <Menu
+    style: {
-      style={{
+      columnCount: Math.floor(bodyshop.md_notes_presets.length / 10) + 1,
-        columnCount: Math.floor(bodyshop.md_notes_presets.length / 10) + 1,
+    },
-      }}
+    items: bodyshop.md_notes_presets.map((i, idx) => ({
-    >
+      key: idx,
-      {bodyshop.md_notes_presets.map((i, idx) => (
+      style: { breakInside: "avoid" },
-        <Menu.Item
+      onClick: () => handleSelect(i),
-          onClick={() => handleSelect(i)}
+      label: i.label,
-          key={idx}
+    })),
-          style={{ breakInside: "avoid" }}
+  };
-        >
-          {i.label}
-        </Menu.Item>
-      ))}
-    </Menu>
-  );
 
   return (
     <div>
-      <Dropdown trigger={["click"]} overlay={menu}>
+      <Dropdown trigger={["click"]} menu={menu}>
         <a
           className="ant-dropdown-link"
           href="# "

client/src/components/owner-detail-form/owner-detail-form.container.jsx

@@ -1,4 +1,5 @@
-import { Button, Form, notification, PageHeader } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, notification } from "antd";
 import React, { useState } from "react";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";

client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx

@@ -76,7 +76,7 @@ export function PartsOrderBackorderEta({
     <Popover
       destroyTooltipOnHide
       content={popContent}
-      visible={visibility}
+      open={visibility}
       disabled={disabled}
     >
       <DateFormatter>{backordered_eta}</DateFormatter>

client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx

@@ -92,7 +92,7 @@ export function PartsOrderLineBackorderButton({
     <Popover
       destroyTooltipOnHide
       content={popContent}
-      visible={visibility}
+      open={visibility}
       disabled={disabled}
     >
       <Button loading={loading} onClick={handlePopover}>

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

@@ -1,17 +1,7 @@
 import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import {
+import { PageHeader } from '@ant-design/pro-layout';
-  Button,
+import { Button, Card, Checkbox, Drawer, Grid, Input, Popconfirm, Space, Table } from "antd";
-  Card,
-  Checkbox,
-  Drawer,
-  Grid,
-  Input,
-  PageHeader,
-  Popconfirm,
-  Space,
-  Table,
-} from "antd";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -471,7 +461,7 @@ export function PartsOrderListTableComponent({
       <Drawer
         placement="right"
         onClose={() => handleOnRowClick(null)}
-        visible={selectedpartsorder}
+        open={selectedpartsorder}
         closable
         width={drawerPercentage}
       >

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

@@ -1,17 +1,11 @@
-import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons";
+import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Divider,
+  Checkbox, Divider, Dropdown, Form,
-  Form,
   Input,
   InputNumber,
-  Radio,
+  Radio, Select, Space,
-  Space,
+  Tag
-  Tag,
-  Select,
-  Menu,
-  Dropdown,
-  Checkbox,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -61,17 +55,14 @@ export function PartsOrderModalComponent({
     form.setFieldsValue({ comments: item.props.value });
   };
 
-  const menu = (
+  const menu = {
-    <div>
+    onClick: handleClick,
-      <Menu onClick={handleClick}>
+    items: bodyshop.md_parts_order_comment.map((comment, idx) => ({
-        {bodyshop.md_parts_order_comment.map((comment, idx) => (
+      key: idx,
-          <Menu.Item value={comment.comment} key={idx}>
+      value: comment.comment,
-            {comment.label}
+      label: comment.label,
-          </Menu.Item>
+    })),
-        ))}
+  };
-      </Menu>
-    </div>
-  );
 
   return (
     <div>
@@ -308,7 +299,7 @@ export function PartsOrderModalComponent({
         label={
           <Space>
             {t("parts_orders.fields.comments")}
-            <Dropdown overlay={menu}>
+            <Dropdown menu={menu}>
               <a
                 className="ant-dropdown-link"
                 href=" #"

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

@@ -350,7 +350,7 @@ export function PartsOrderModalContainer({
 
   return (
     <Modal
-      visible={visible}
+    open={visible}
       title={
         isReturn
           ? `${t("parts_orders.labels.returnpartsorder")} ${invoiceNumber}`

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

@@ -92,7 +92,7 @@ export function PartsReceiveModalContainer({
 
   return (
     <Modal
-      visible={visible}
+    open={visible}
       title={t("parts_orders.labels.receive")}
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}

client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx

@@ -90,7 +90,7 @@ export function BillMarkSelectedExported({
 
   return (
     <Popconfirm
-      visible={visible}
+      open={visible}
       title={t("general.labels.areyousure")}
       onCancel={() => setVisible(false)}
       onConfirm={handleUpdate}

client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx

@@ -93,7 +93,7 @@ export function PaymentMarkSelectedExported({
 
   return (
     <Popconfirm
-      visible={visible}
+    open={visible}
       title={t("general.labels.areyousure")}
       onCancel={() => setVisible(false)}
       onConfirm={handleUpdate}

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

@@ -138,7 +138,7 @@ function PaymentModalContainer({
           ? t("payments.labels.new")
           : t("payments.labels.edit")
       }
-      visible={visible}
+      open={visible}
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"

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

@@ -1,4 +1,5 @@
-import { Button, Form, Input, PageHeader, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Input, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";

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

@@ -123,7 +123,7 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
     </Card>
   );
   return (
-    <Popover content={content} visible={isModalVisible}>
+    <Popover content={content} open={isModalVisible}>
       <Button onClick={() => setIsModalVisible(true)}>
         {t("printcenter.jobs.labels.labels")}
       </Button>

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

@@ -28,7 +28,7 @@ export function PrintCenterModalContainer({
 
   return (
     <Modal
-      visible={visible}
+    open={visible}
       onOk={() => toggleModalVisible()}
       onCancel={() => toggleModalVisible()}
       cancelButtonProps={{ style: { display: "none" } }}

client/src/components/print-center-speed-print/print-center-speed-print.component.jsx

@@ -1,4 +1,5 @@
-import { Button, List, PageHeader } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, List } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";

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

@@ -166,7 +166,7 @@ export default function ProductionBoardKanbanCardSettings({
     </div>
   );
   return (
-    <Popover content={overlay} visible={visible}>
+    <Popover content={overlay} open={visible}>
       <Button loading={loading} onClick={() => setVisible(true)}>
         {t("production.labels.cardsettings")}
       </Button>

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

@@ -1,7 +1,8 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import Board, { moveCard } from "@asseinfo/react-kanban";
-import { Button, Grid, notification, PageHeader, Space, Statistic } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Grid, notification, Space, Statistic } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";

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

@@ -1,7 +1,7 @@
+import { Button, Dropdown } from "antd";
 import React from "react";
-import { Button, Dropdown, Menu } from "antd";
-import dataSource from "./production-list-columns.data";
 import { useTranslation } from "react-i18next";
+import dataSource from "./production-list-columns.data";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -47,37 +47,24 @@ export function ProductionColumnsComponent({
     state: tableState,
     activeStatuses: bodyshop.md_ro_statuses.active_statuses,
   });
-  const menu = (
+  const menu = {
-    <Menu
+    style: {
-      onClick={handleAdd}
+      columnCount: Math.max(Math.floor(cols.length / 10), 1),
-      style={{
+    },
-        columnCount: Math.max(Math.floor(cols.length / 10), 1),
+    onClick: handleAdd,
-      }}
+    items: cols
-    >
+      .filter((i) => !columnKeys.includes(i.key))
-      {cols
+      .map((item) => ({
-        .filter((i) => !columnKeys.includes(i.key))
+        key: item.key,
-        .map((item) => (
+        style: { breakInside: "avoid" },
-          <Menu.Item key={item.key} style={{ breakInside: "avoid" }}>
+        label: item.title,
-            {item.title}
+      })),
-          </Menu.Item>
+  };
-        ))}
-    </Menu>
-  );
   return (
     <div>
-      <Dropdown overlay={menu}>
+      <Dropdown menu={menu}>
         <Button>{t("production.actions.addcolumns")}</Button>
       </Dropdown>
     </div>
   );
 }
-
-// <Transfer
-// dataSource={dataSource}
-// titles={["Source", "Target"]}
-// targetKeys={columns.map((c) => c.key)}
-// render={(item) => item.title}
-// onChange={(nextTargetKeys, direction, moveKeys) => {
-//   setColumns(dataSource.filter((i) => nextTargetKeys.includes(i.key)));
-// }}
-// />

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

@@ -1,10 +1,10 @@
 import { ExclamationCircleFilled } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import { useMutation } from "@apollo/client";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { useMutation } from "@apollo/client";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 export default function ProductionListColumnAlert({ record }) {
   const { t } = useTranslation();
@@ -34,15 +34,18 @@ export default function ProductionListColumnAlert({ record }) {
 
   return (
     <Dropdown
-      overlay={
+      menu={{
-        <Menu>
+        items: [
-          <Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
+          {
-            {record.production_vars && record.production_vars.alert
+            key: "toggleAlert",
-              ? t("production.labels.alertoff")
+            onClick: handleAlertToggle,
-              : t("production.labels.alerton")}
+            label:
-          </Menu.Item>
+              record.production_vars && record.production_vars.alert
-        </Menu>
+                ? t("production.labels.alertoff")
-      }
+                : t("production.labels.alerton"),
+          },
+        ],
+      }}
       trigger={["contextMenu"]}
     >
       <div

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

@@ -1,9 +1,9 @@
 import { useMutation } from "@apollo/client";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 export default function ProductionListColumnBodyPriority({ record }) {
   const { t } = useTranslation();
@@ -31,25 +31,27 @@ export default function ProductionListColumnBodyPriority({ record }) {
 
   return (
     <Dropdown
-      overlay={
+      menu={{
-        <Menu onClick={handleSetBodyPriority}>
+        onClick: handleSetBodyPriority,
-          <Menu.Item key="clearBodyPriority">
+        items: [
-            {t("production.actions.bodypriority-clear")}
+          {
-          </Menu.Item>
+            key: "clearBodyPriority",
-          <Menu.SubMenu
+            label: t("production.actions.bodypriority-clear"),
-            key="set"
+          },
-            title={t("production.actions.bodypriority-set")}
+          {
-          >
+            key: "set",
-            {new Array(15).fill().map((value, index) => (
+            label: t("production.actions.bodypriority-set"),
-              <Menu.Item key={index + 1}>
+            children: new Array(15).fill().map((value, index) => ({
+              key: index + 1,
+              label: (
                 <div style={{ marginLeft: "2rem", marginRight: "2rem" }}>
                   {index + 1}
                 </div>
-              </Menu.Item>
+              ),
-            ))}
+            })),
-          </Menu.SubMenu>
+          },
-        </Menu>
+        ],
-      }
+      }}
       trigger={["click"]}
     >
       <div style={{ width: "100%", height: "19px" }}>

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

@@ -41,8 +41,8 @@ export default function ProductionListColumnComment({ record }) {
 
   return (
     <Popover
-      onVisibleChange={handleVisibleChange}
+      onOpenChange={handleVisibleChange}
-      visible={visible}
+      open={visible}
       content={
         <div style={{ width: "30em" }}>
           <Input.TextArea

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

@@ -52,7 +52,7 @@ export default function ProductionListDate({
   return (
     <Dropdown
       //trigger={["click"]}
-      visible={visible}
+      open={visible}
       style={{
         height: "19px",
       }}

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

@@ -1,9 +1,9 @@
 import { useMutation } from "@apollo/client";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 export default function ProductionListColumnDetailPriority({ record }) {
   const { t } = useTranslation();
@@ -31,25 +31,27 @@ export default function ProductionListColumnDetailPriority({ record }) {
 
   return (
     <Dropdown
-      overlay={
+      menu={{
-        <Menu onClick={handleSetDetailPriority}>
+        onClick: handleSetDetailPriority,
-          <Menu.Item key="clearDetailPriority">
+        items: [
-            {t("production.actions.detailpriority-clear")}
+          {
-          </Menu.Item>
+            key: "clearDetailPriority",
-          <Menu.SubMenu
+            label: t("production.actions.detailpriority-clear"),
-            key="set"
+          },
-            title={t("production.actions.detailpriority-set")}
+          {
-          >
+            key: "set",
-            {new Array(15).fill().map((value, index) => (
+            label: t("production.actions.detailpriority-set"),
-              <Menu.Item key={index + 1}>
+            children: new Array(15).fill().map((value, index) => ({
+              key: index + 1,
+              label: (
                 <div style={{ marginLeft: "2rem", marginRight: "2rem" }}>
                   {index + 1}
                 </div>
-              </Menu.Item>
+              ),
-            ))}
+            })),
-          </Menu.SubMenu>
+          },
-        </Menu>
+        ],
-      }
+      }}
       trigger={["click"]}
     >
       <div style={{ width: "100%", height: "19px" }}>

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

@@ -153,7 +153,7 @@ export function ProductionListEmpAssignment({
     theEmployee = bodyshop.employees.find((e) => e.id === record[type]);
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} visible={visibility}>
+    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
       <Spin spinning={loading}>
         {record[type] ? (
           <div>

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

@@ -93,7 +93,7 @@ export function ProductionLastContacted({ currentUser, record }) {
     <div>
       <Dropdown
         //trigger={["click"]}
-        visible={visible}
+        open={visible}
         style={{
           height: "19px",
         }}

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

@@ -1,9 +1,9 @@
 import { useMutation } from "@apollo/client";
-import { Dropdown, Menu } from "antd";
+import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 export default function ProductionListColumnPaintPriority({ record }) {
   const { t } = useTranslation();
@@ -31,25 +31,27 @@ export default function ProductionListColumnPaintPriority({ record }) {
 
   return (
     <Dropdown
-      overlay={
+      menu={{
-        <Menu onClick={handleSetPaintPriority}>
+        onClick: handleSetPaintPriority,
-          <Menu.Item key="clearPaintPriority">
+        items: [
-            {t("production.actions.paintpriority-clear")}
+          {
-          </Menu.Item>
+            key: "clearPaintPriority",
-          <Menu.SubMenu
+            label: t("production.actions.paintpriority-clear"),
-            key="set"
+          },
-            title={t("production.actions.paintpriority-set")}
+          {
-          >
+            key: "set",
-            {new Array(15).fill().map((value, index) => (
+            label: t("production.actions.paintpriority-set"),
-              <Menu.Item key={index + 1}>
+            children: new Array(15).fill().map((value, index) => ({
+              key: index + 1,
+              label: (
                 <div style={{ marginLeft: "2rem", marginRight: "2rem" }}>
                   {index + 1}
                 </div>
-              </Menu.Item>
+              ),
-            ))}
+            })),
-          </Menu.SubMenu>
+          },
-        </Menu>
+        ],
-      }
+      }}
       trigger={["click"]}
     >
       <div style={{ width: "100%", height: "19px" }}>

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

@@ -49,8 +49,8 @@ export default function ProductionListColumnProductionNote({ record }) {
 
   return (
     <Popover
-      onVisibleChange={handleVisibleChange}
+      onOpenChange={handleVisibleChange}
-      visible={visible}
+      open={visible}
       content={
         <div style={{ width: "30em" }}>
           <Input.TextArea

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

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Dropdown, Menu, Spin } from "antd";
+import { Dropdown, Spin } from "antd";
 import React, { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -38,16 +38,14 @@ export function ProductionListColumnCategory({ record, bodyshop }) {
 
   return (
     <Dropdown
-      overlay={
+      menu={{
-        <Menu
+        style: { maxHeight: "200px", overflowY: "auto" },
-          style={{ maxHeight: "200px", overflowY: "auto" }}
+        onClick: handleSetStatus,
-          onClick={handleSetStatus}
+        items: bodyshop.md_categories.map((item) => ({
-        >
+          key: item,
-          {bodyshop.md_categories.map((item) => (
+          label: item,
-            <Menu.Item key={item}>{item}</Menu.Item>
+        })),
-          ))}
+      }}
-        </Menu>
-      }
       trigger={["click"]}
     >
       <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>

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

@@ -1,12 +1,12 @@
 import { useMutation } from "@apollo/client";
-import { Dropdown, Menu, Spin } from "antd";
+import { Dropdown, Spin } from "antd";
 import React, { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
@@ -47,16 +47,14 @@ export function ProductionListColumnStatus({
 
   return (
     <Dropdown
-      overlay={
+      menu={{
-        <Menu
+        style: { maxHeight: "200px", overflowY: "auto" },
-          style={{ maxHeight: "200px", overflowY: "auto" }}
+        onClick: handleSetStatus,
-          onClick={handleSetStatus}
+        items: bodyshop.md_ro_statuses.production_statuses.map((item) => ({
-        >
+          key: item,
-          {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+          label: item,
-            <Menu.Item key={item}>{item}</Menu.Item>
+        })),
-          ))}
+      }}
-        </Menu>
-      }
       trigger={["click"]}
     >
       <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>

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

@@ -1,5 +1,6 @@
 import { useQuery } from "@apollo/client";
-import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Descriptions, Drawer, Space, Button } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -90,7 +91,7 @@ export function ProductionListDetail({
       placement="right"
       width={"33%"}
       onClose={handleClose}
-      visible={selected}
+      open={selected}
     >
       {loading && <LoadingSkeleton />}
       {error && <AlertComponent error={JSON.stringify(error)} />}

client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx

@@ -88,7 +88,7 @@ export function ProductionListSaveConfigButton({
   );
 
   return (
-    <Popover visible={visible} content={popMenu}>
+    <Popover open={visible} content={popMenu}>
       <Button loading={loading} onClick={() => setVisible(true)}>
         {t("production.actions.saveconfig")}
       </Button>

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

@@ -1,8 +1,8 @@
-import { Button, Dropdown, Menu } from "antd";
+import { Button, Dropdown } from "antd";
 import React, { useState } from "react";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { useTranslation } from "react-i18next";
 import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -31,98 +31,86 @@ export function ProductionListPrint({ bodyshop }) {
   return (
     <Dropdown
       trigger="click"
-      overlay={
+      menu={{
-        <Menu>
+        items: [
-          {Object.keys(ProdTemplates).map((key) => (
+          ...Object.keys(ProdTemplates).map((key) => ({
-            <Menu.Item
+            key: key,
-              key={key}
+            onClick: async () => {
-              onClick={async () => {
+              setLoading(true);
+              await GenerateDocument(
+                {
+                  name: ProdTemplates[key].key,
+                  // variables: { id: contract.id },
+                },
+                {},
+                "p"
+              );
+              setLoading(false);
+            },
+            label: ProdTemplates[key].title,
+          })),
+          {
+            key: "prodbyonetech",
+            label: t("reportcenter.templates.production_by_technician_one"),
+            children: bodyshop.employees.map((e) => ({
+              key: e.id,
+              onClick: async () => {
                 setLoading(true);
                 await GenerateDocument(
                   {
-                    name: ProdTemplates[key].key,
+                    name: production_by_technician_one.key,
-                    // variables: { id: contract.id },
+                    variables: { id: e.id },
                   },
                   {},
                   "p"
                 );
                 setLoading(false);
-              }}
+              },
-            >
+              label: `${e.first_name || ""} ${e.last_name || ""}`.trim(),
-              {ProdTemplates[key].title}
+            })),
-            </Menu.Item>
+          },
-          ))}
+          {
-          <Menu.SubMenu
+            key: "prodbycategory",
-            title={t("reportcenter.templates.production_by_technician_one")}
+            label: t("reportcenter.templates.production_by_category_one"),
-          >
+            children: bodyshop.md_categories.map((e) => ({
-            {bodyshop.employees.map((e) => (
+              key: e,
-              <Menu.Item
+              onClick: async () => {
-                key={e.id}
+                setLoading(true);
-                onClick={async () => {
+                await GenerateDocument(
-                  setLoading(true);
+                  {
-                  await GenerateDocument(
+                    name: production_by_category_one.key,
-                    {
+                    variables: { category: e },
-                      name: production_by_technician_one.key,
+                  },
-                      variables: { id: e.id },
+                  {},
-                    },
+                  "p"
-                    {},
+                );
-                    "p"
+                setLoading(false);
-                  );
+              },
-                  setLoading(false);
+              label: e,
-                }}
+            })),
-              >
+          },
-                {e.first_name} {e.last_name}
+          {
-              </Menu.Item>
+            key: "prodbyrepairstatus",
-            ))}
+            label: t("reportcenter.templates.production_by_repair_status_one"),
-          </Menu.SubMenu>
+            children: bodyshop.md_ro_statuses.production_statuses.map((e) => ({
-          <Menu.SubMenu
+              key: e,
-            title={t("reportcenter.templates.production_by_category_one")}
+              onClick: async () => {
-          >
+                setLoading(true);
-            {bodyshop.md_categories.map((e) => (
+                await GenerateDocument(
-              <Menu.Item
+                  {
-                key={e}
+                    name: production_by_repair_status_one.key,
-                onClick={async () => {
+                    variables: { status: e },
-                  setLoading(true);
+                  },
-                  await GenerateDocument(
+                  {},
-                    {
+                  "p"
-                      name: production_by_category_one.key,
+                );
-                      variables: { category: e },
+                setLoading(false);
-                    },
+              },
-                    {},
+              label: e,
-                    "p"
+            })),
-                  );
+          },
-                  setLoading(false);
+        ],
-                }}
+      }}
-              >
-                {e}
-              </Menu.Item>
-            ))}
-          </Menu.SubMenu>
-          <Menu.SubMenu
-            title={t("reportcenter.templates.production_by_repair_status_one")}
-          >
-            {bodyshop.md_ro_statuses.production_statuses.map((e) => (
-              <Menu.Item
-                key={e}
-                onClick={async () => {
-                  setLoading(true);
-                  await GenerateDocument(
-                    {
-                      name: production_by_repair_status_one.key,
-                      variables: { status: e },
-                    },
-                    {},
-                    "p"
-                  );
-                  setLoading(false);
-                }}
-              >
-                {e}
-              </Menu.Item>
-            ))}
-          </Menu.SubMenu>
-        </Menu>
-      }
     >
       <Button loading={loading}>{t("general.labels.print")}</Button>
     </Dropdown>

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

@@ -1,15 +1,7 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import {
+import { PageHeader } from '@ant-design/pro-layout';
-  Button,
+import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
-  Dropdown,
-  Input,
-  Menu,
-  PageHeader,
-  Space,
-  Statistic,
-  Table,
-} from "antd";
 import React, { useMemo, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
@@ -121,13 +113,10 @@ export function ProductionListTable({
   const headerItem = (col) => (
     <Dropdown
       className="prod-header-dropdown"
-      overlay={
+      menu={{
-        <Menu onClick={removeColumn}>
+        onClick: removeColumn,
-          <Menu.Item key={col.key}>
+        items: [{ key: col.key, label: t("production.actions.removecolumn") }],
-            {t("production.actions.removecolumn")}
+      }}
-          </Menu.Item>
-        </Menu>
-      }
       trigger={["contextMenu"]}
     >
       <span>{col.title}</span>

client/src/components/qbo-authorize/qbo-authorize.component.jsx

@@ -2,14 +2,13 @@ import { Space } from "antd";
 import Axios from "axios";
 import queryString from "query-string";
 import React, { useEffect } from "react";
-import { useCookies } from "react-cookie";
+
 import { useHistory, useLocation } from "react-router-dom";
 import QboSignIn from "../../assets/qbo/C2QB_green_btn_med_default.svg";
 
 export default function QboAuthorizeComponent() {
   const location = useLocation();
   const history = useHistory();
-  const [, setCookie] = useCookies(["access_token", "refresh_token"]);
 
   const handleQbSignIn = async () => {
     const result = await Axios.post("/qbo/authorize");
@@ -42,7 +41,7 @@ export default function QboAuthorizeComponent() {
       history.push({ pathname: `/manage/accounting/receivables` });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [qs, location, setCookie]);
+  }, [qs, location]);
 
   return (
     <Space>

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

@@ -25,7 +25,7 @@ export function ReportCenterModalContainer({
 
   return (
     <Modal
-      visible={visible}
+    open={visible}
       title={t("printcenter.labels.reportcentermodal")}
       onOk={() => toggleModalVisible()}
       onCancel={() => toggleModalVisible()}

client/src/components/schedule-block-day/schedule-block-day.component.jsx

@@ -1,13 +1,13 @@
 import { useMutation } from "@apollo/client";
-import { Dropdown, Menu, notification } from "antd";
+import { Dropdown, notification } from "antd";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_APPOINTMENT_BLOCK } from "../../graphql/appointments.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -55,15 +55,12 @@ export function ScheduleBlockDay({
     }
   };
 
-  const menu = (
-    <Menu onClick={handleMenu}>
-      <Menu.Item key="block">{t("appointments.actions.block")}</Menu.Item>
-    </Menu>
-  );
-
   return (
     <Dropdown
-      overlay={menu}
+      menu={{
+        onClick: handleMenu,
+        items: [{ key: 'block', label: t("appointments.actions.block") }],
+      }}
       disabled={alreadyBlocked}
       trigger={["contextMenu"]}
     >

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -1,5 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Checkbox, Col, PageHeader, Row, Space } from "antd";
+import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Card, Checkbox, Col, Row, Space } from "antd";
 import { t } from "i18next";
 import React, { useMemo } from "react";
 import useLocalStorage from "../../utils/useLocalStorage";

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

@@ -184,7 +184,7 @@ export function ScheduleJobModalContainer({
 
   return (
     <Modal
-      visible={visible}
+    open={visible}
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}
       width={"90%"}

client/src/components/schedule-manual-event/schedule-manual-event.component.jsx

@@ -154,7 +154,7 @@ export function ScheduleManualEvent({ bodyshop, event }) {
   };
 
   return (
-    <Popover content={overlay} visible={visibility}>
+    <Popover content={overlay} open={visibility}>
       <Button loading={loading} onClick={handleClick}>
         {event
           ? t("appointments.actions.reschedule")

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

@@ -90,7 +90,7 @@ export default function ScoreboardEntryEdit({ entry }) {
 
   return (
     <div>
-      <Dropdown visible={visible} overlay={popContent}>
+      <Dropdown open={visible} overlay={popContent}>
         <Button
           onClick={(e) => {
             e.stopPropagation();

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

@@ -100,7 +100,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
   return (
     <>
       <Modal
-        visible={state.visible}
+      open={state.visible}
         destroyOnClose
         width="80%"
         cancelButtonProps={{ style: { display: "none" } }}