Revert all package upgrades to unblock testing.

client/craco.config.js

@@ -1,5 +1,6 @@
 // craco.config.js
 const TerserPlugin = require("terser-webpack-plugin");
+const CracoLessPlugin = require("craco-less");
 const SentryWebpackPlugin = require("@sentry/webpack-plugin");
 
 module.exports = {
@@ -19,6 +20,37 @@ 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,55 +4,59 @@
   "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": "^7.0.0",
+    "@craco/craco": "^6.4.5",
+    "@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": "5.1.5",
+    "antd": "^4.22.3",
     "apollo-link-logger": "^2.0.0",
-    "axios": "^1.2.3",
+    "axios": "^0.27.2",
+    "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": "^22.4.6",
+    "i18next": "^21.8.14",
-    "i18next-browser-languagedetector": "^7.0.1",
+    "i18next-browser-languagedetector": "^6.1.4",
+    "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": "^8.0.0",
+    "normalize-url": "^7.0.3",
-    "phone": "^3.1.32",
+    "phone": "^3.1.23",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^8.1.0",
+    "query-string": "^7.1.1",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
-    "react": "^18.2.0",
+    "react": "^17.0.2",
-    "react-big-calendar": "^1.5.2",
+    "react-big-calendar": "^1.5.0",
     "react-color": "^2.19.3",
-    "react-dom": "^18.2.0",
+    "react-cookie": "^4.1.1",
-    "react-drag-listview": "^2.0.0",
+    "react-dom": "^17.0.2",
-    "react-grid-gallery": "^1.0.0",
+    "react-drag-listview": "^0.2.1",
+    "react-grid-gallery": "^0.5.5",
     "react-grid-layout": "^1.3.4",
-    "react-i18next": "^12.1.1",
+    "react-i18next": "^11.18.1",
-    "react-icons": "^4.7.1",
+    "react-icons": "^4.4.0",
-    "react-image-lightbox": "^5.1.4",
+    "react-number-format": "^4.9.3",
-    "react-number-format": "^5.1.2",
+    "react-redux": "^7.2.8",
-    "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",
     "react-router-dom": "^5.3.0",
-    "react-scripts": "^5.0.1",
+    "react-scripts": "^4.0.3",
     "react-sticky": "^6.0.3",
+    "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
     "recharts": "^2.1.12",
     "redux": "^4.2.0",
@@ -64,7 +68,7 @@
     "socket.io-client": "^4.5.1",
     "styled-components": "^5.3.5",
     "subscriptions-transport-ws": "^0.11.0",
-    "web-vitals": "^3.1.0",
+    "web-vitals": "^2.1.4",
     "workbox-background-sync": "^6.5.3",
     "workbox-broadcast-update": "^6.5.3",
     "workbox-cacheable-response": "^6.5.3",
@@ -76,12 +80,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!'",
@@ -114,8 +118,8 @@
   },
   "devDependencies": {
     "@sentry/webpack-plugin": "^1.20.0",
-    "@testing-library/cypress": "^9.0.0",
+    "@testing-library/cypress": "^8.0.3",
-    "cypress": "^12.3.0",
+    "cypress": "^10.3.1",
     "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} open={visibility}>
+    <Popover content={popContent} visible={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} open={visibility}>
+    <Popover content={popContent} visible={visibility}>
       <Button disabled={disabled} onClick={() => setVisibility(true)}>
         {t("allocations.actions.assign")}
       </Button>

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

@@ -1,6 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, PageHeader, Popconfirm, Space } from "antd";
-import { Button, Form, Popconfirm, Space } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useState } from "react";
@@ -179,7 +178,7 @@ export function BillDetailEditcontainer({
                 <BillDetailEditReturn data={data} />
 
                 <Popconfirm
-                  open={visible}
+                  visible={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
-        open={visible}
+        visible={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
-      open={search.billid}
+      visible={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%"}
-      open={billEnterModal.visible}
+      visible={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
-      open={visible}
+      visible={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}
-      open={visibility}
+      visible={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"
-      open={visible}
+      visible={visible}
-      onOpenChange={handleVisibleChange}
+      onVisibleChange={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -16,15 +16,19 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
-  const menu = bodyshop.md_messaging_presets.map((i, idx) => ({
+  const menu = (
-    label: i.label,
+    <Menu>
-    key: idx,
+      {bodyshop.md_messaging_presets.map((i, idx) => (
-    onClick: () => setMessage(i.text),
+        <Menu.Item onClick={() => setMessage(i.text)} key={idx}>
-  }));
+          {i.label}
+        </Menu.Item>
+      ))}
+    </Menu>
+  );
 
   return (
     <div className={className}>
-      <Dropdown trigger={["click"]} menu={{ items: menu }} placement="top">
+      <Dropdown trigger={["click"]} overlay={menu}>
         <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} open={visible}>
+      <Popover content={popContent} visible={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
-        open={modalVisible}
+        visible={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
-      open={visible}
+      visible={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -13,14 +13,25 @@ const mapStateToProps = createStructuredSelector({
 export function ContractsRatesChangeButton({ disabled, form, bodyshop }) {
   const { t } = useTranslation();
 
-  const menu = bodyshop.md_ccc_rates.map((rate, idx) => ({
+  const handleClick = ({ item, key, keyPath }) => {
-    onClick: () => form.setFieldsValue(rate),
+    const { label, ...rate } = item.props.value;
-    key: idx,
+    form.setFieldsValue(rate);
-    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 menu={{ items: menu }} disabled={disabled}>
+    <Dropdown overlay={menu} disabled={disabled}>
       <a
         className="ant-dropdown-link"
         href=" #"

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

@@ -1,7 +1,6 @@
 import { WarningFilled } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Input, InputNumber, PageHeader, Space } from "antd";
-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")}
-      open={visible}
+      visible={visible}
       onCancel={() => toggleModalVisible()}
       width={"90%"}
       okText={t("general.actions.save")}

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

@@ -3,19 +3,21 @@ import {
   Button,
   Card,
   Dropdown,
-  Input, Space,
+  Input,
+  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 { GenerateDocument } from "../../utils/RenderTemplate";
 import { alphaSort } from "../../utils/sorters";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+import moment from "moment";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
@@ -177,14 +179,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           </Button>
           <Dropdown
             trigger="click"
-            menu={{
+            overlay={
-              items: [
+              <Menu>
-                {
+                <Menu.Item
-                  label: t(
+                  onClick={() =>
-                    "printcenter.courtesycarcontract.courtesy_car_inventory"
-                  ),
-                  key: "cc_inv",
-                  onClick: () =>
                     GenerateDocument(
                       {
                         name: TemplateList("courtesycar").courtesy_car_inventory
@@ -195,10 +193,13 @@ 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,7 +1,6 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
 import { gql, useMutation, useQuery } from "@apollo/client";
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Dropdown, Menu, notification, PageHeader, Space } from "antd";
-import { Button, Dropdown, Menu, notification, Space } from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
@@ -118,15 +117,17 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
   );
   const existingLayoutKeys = state.items.map((i) => i.i);
   const addComponentOverlay = (
-    <Menu
+    <Menu onClick={handleAddComponent}>
-      onClick={handleAddComponent}
+      {Object.keys(componentList).map((key) => (
-      items={Object.keys(componentList).map((key) => ({
+        <Menu.Item
-        key: key,
+          key={key}
-        value: key,
+          value={key}
-        disabled: existingLayoutKeys.includes(key),
+          disabled={existingLayoutKeys.includes(key)}
-        label: componentList[key].label,
+        >
-      }))}
+          {componentList[key].label}
-    ></Menu>
+        </Menu.Item>
+      ))}
+    </Menu>
   );
 
   if (error) return <AlertComponent message={error.message} type="error" />;
@@ -282,12 +283,8 @@ const createDashboardQuery = (state) => {
       monthly_sales: jobs(where: {_and: [
         { voided: {_eq: false}},
         {date_invoiced: {_gte: "${moment()
-          .startOf("month")
+        .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
-          .startOf("day")
+    .endOf("month").endOf('day').toISOString()}"}}]}) {
-          .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%"}
-        open={visible}
+        visible={visible}
         onCancel={() => setVisible(false)}
         onOk={() => {
           form.setFieldsValue({

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

@@ -6,10 +6,12 @@ import {
   Dropdown,
   Form,
   Input,
-  InputNumber, Select,
+  InputNumber,
+  Menu,
+  Select,
   Space,
   Statistic,
-  Typography
+  Typography,
 } from "antd";
 import Dinero from "dinero.js";
 import moment from "moment";
@@ -275,32 +277,36 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
                           <div>
                             {t("jobs.fields.dms.payer.controlnumber")}{" "}
                             <Dropdown
-                              menu={{
+                              overlay={
-                                items:
+                                <Menu>
-                                  bodyshop.cdk_configuration.controllist &&
+                                  {bodyshop.cdk_configuration.controllist &&
-                                  bodyshop.cdk_configuration.controllist.map(
+                                    bodyshop.cdk_configuration.controllist.map(
-                                    (key, idx) => ({
+                                      (key, idx) => (
-                                      key: idx,
+                                        <Menu.Item
-                                      label: key.name,
+                                          key={idx}
-                                      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,23 +57,20 @@ export function EmailOverlayComponent({
 
   const menu = (
     <div>
-      <Menu
+      <Menu onClick={handleClick}>
-        onClick={handleClick}
+        {bodyshop.employees
-        items={[
+          .filter((e) => e.user_email)
-          ...bodyshop.employees
+          .map((e, idx) => (
-            .filter((e) => e.user_email)
+            <Menu.Item value={e.user_email} key={idx}>
-            .map((e, idx) => ({
+              {`${e.first_name} ${e.last_name}`}
-              value: e.user_email,
+            </Menu.Item>
-              key: idx,
+          ))}
-              label: `${e.first_name} ${e.last_name}`,
+        {bodyshop.md_to_emails.map((e, idx) => (
-            })),
+          <Menu.Item value={e.emails} key={idx + "group"}>
-          ...bodyshop.md_to_emails.map((e, idx) => ({
+            {e.label}
-            value: e.emails,
+          </Menu.Item>
-            key: idx + "group",
+        ))}
-            label: e.label,
+      </Menu>
-          })),
-        ]}
-      />
     </div>
   );
 

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

@@ -174,7 +174,7 @@ export function EmailOverlayContainer({
   return (
     <Modal
       destroyOnClose={true}
-      open={modalVisible}
+      visible={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} open={history.length > 0}>
+      <Popover content={popContent} visible={history.length > 0}>
         <InputNumber
           ref={ref}
           value={value}

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

@@ -106,421 +106,304 @@ function Header({
         selectedKeys={[selectedHeader]}
         onClick={handleMenuClick}
         subMenuCloseDelay={0.3}
-        items={[
+      >
-          {
+        <Menu.Item key="home" icon={<HomeFilled />}>
-            key: "home",
+          <Link to="/manage">{t("menus.header.home")}</Link>
-            icon: <HomeFilled />,
+        </Menu.Item>
-            label: <Link to="/manage">{t("menus.header.home")}</Link>,
+        <Menu.Item key="schedule" icon={<Icon component={FaCalendarAlt} />}>
-          },
+          <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
-          {
+        </Menu.Item>
-            key: "schedule",
+        <Menu.SubMenu
-            icon: <Icon component={FaCalendarAlt} />,
+          key="jobssubmenu"
-            label: (
+          icon={<Icon component={FaCarCrash} />}
-              <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
+          title={t("menus.header.jobs")}
-            ),
+        >
-          },
+          <Menu.Item key="activejobs" icon={<FileFilled />}>
-          {
+            <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
-            key: "jobssubmenu",
+          </Menu.Item>
-            icon: <Icon component={FaCarCrash} />,
+          <Menu.Item key="readyjobs" icon={<CheckCircleOutlined />}>
-            label: t("menus.header.jobs"),
+            <Link to="/manage/jobs/ready">{t("menus.header.readyjobs")}</Link>
-            children: [
+          </Menu.Item>
-              {
+          <Menu.Item key="parts-queue" icon={<ToolFilled />}>
-                key: "activejobs",
+            <Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
-                icon: <FileFilled />,
+          </Menu.Item>
-                label: (
+          <Menu.Item key="availablejobs" icon={<ImportOutlined />}>
-                  <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
+            <Link to="/manage/available">
-                ),
+              {t("menus.header.availablejobs")}
-              },
+            </Link>
-              {
+          </Menu.Item>
-                key: "readyjobs",
+          <Menu.Item key="newjob" icon={<FileAddOutlined />}>
-                icon: <CheckCircleOutlined />,
+            <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
-                label: (
+          </Menu.Item>
-                  <Link to="/manage/jobs/ready">
+          <Menu.Divider key="div1" />
-                    {t("menus.header.readyjobs")}
+          <Menu.Item key="alljobs" icon={<UnorderedListOutlined />}>
-                  </Link>
+            <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
-                ),
+          </Menu.Item>
-              },
+          <Menu.Divider key="div2" />
-              {
+          <Menu.Item key="productionlist" icon={<ScheduleOutlined />}>
-                key: "parts-queue",
+            <Link to="/manage/production/list">
-                icon: <ToolFilled />,
+              {t("menus.header.productionlist")}
-                label: (
+            </Link>
-                  <Link to="/manage/partsqueue">
+          </Menu.Item>
-                    {t("menus.header.parts-queue")}
+          <Menu.Item key="productionboard" icon={<Icon component={BsKanban} />}>
-                  </Link>
+            <Link to="/manage/production/board">
-                ),
+              {t("menus.header.productionboard")}
-              },
+            </Link>
-              {
+          </Menu.Item>
-                key: "availablejobs",
+          <Menu.Divider key="div3" />
-                icon: <ImportOutlined />,
+          <Menu.Item key="scoreboard" icon={<LineChartOutlined />}>
-                label: (
+            <Link to="/manage/scoreboard">{t("menus.header.scoreboard")}</Link>
-                  <Link to="/manage/available">
+          </Menu.Item>
-                    {t("menus.header.availablejobs")}
+        </Menu.SubMenu>
-                  </Link>
+        <Menu.SubMenu
-                ),
+          key="customers"
-              },
+          icon={<UserOutlined />}
-              {
+          title={t("menus.header.customers")}
-                key: "newjob",
+        >
-                icon: <FileAddOutlined />,
+          <Menu.Item key="owners" icon={<TeamOutlined />}>
-                label: (
+            <Link to="/manage/owners">{t("menus.header.owners")}</Link>
-                  <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
+          </Menu.Item>
-                ),
+          <Menu.Item key="vehicles" icon={<CarFilled />}>
-              },
+            <Link to="/manage/vehicles">{t("menus.header.vehicles")}</Link>
-              { type: "divider" },
+          </Menu.Item>
-              {
+        </Menu.SubMenu>
-                key: "alljobs",
+        <Menu.SubMenu
-                icon: <UnorderedListOutlined />,
+          key="ccs"
-                label: (
+          icon={<CarFilled />}
-                  <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
+          title={t("menus.header.courtesycars")}
-                ),
+        >
-              },
+          <Menu.Item key="courtesycarsall" icon={<CarFilled />}>
-              { type: "divider" },
+            <Link to="/manage/courtesycars">
-              {
+              {t("menus.header.courtesycars-all")}
-                key: "productionlist",
+            </Link>
-                icon: <ScheduleOutlined />,
+          </Menu.Item>
-                label: (
+          <Menu.Item key="contracts" icon={<FileFilled />}>
-                  <Link to="/manage/production/list">
+            <Link to="/manage/courtesycars/contracts">
-                    {t("menus.header.productionlist")}
+              {t("menus.header.courtesycars-contracts")}
-                  </Link>
+            </Link>
-                ),
+          </Menu.Item>
-              },
+          <Menu.Item key="newcontract" icon={<FileAddFilled />}>
-              {
+            <Link to="/manage/courtesycars/contracts/new">
-                key: "productionboard",
+              {t("menus.header.courtesycars-newcontract")}
-                icon: <Icon component={BsKanban} />,
+            </Link>
-                label: (
+          </Menu.Item>
-                  <Link to="/manage/production/board">
+        </Menu.SubMenu>
-                    {t("menus.header.productionboard")}
+        <Menu.SubMenu
-                  </Link>
+          key="accounting"
-                ),
+          icon={<DollarCircleFilled />}
-              },
+          title={t("menus.header.accounting")}
-              {
+        >
-                type: "divider",
+          <Menu.Item
-              },
+            key="bills"
-              {
+            icon={<Icon component={FaFileInvoiceDollar} />}
-                key: "scoreboard",
+          >
-                icon: <LineChartOutlined />,
+            <Link to="/manage/bills">{t("menus.header.bills")}</Link>
-                label: (
+          </Menu.Item>
-                  <Link to="/manage/scoreboard">
+          <Menu.Item
-                    {t("menus.header.scoreboard")}
+            key="enterbills"
-                  </Link>
+            icon={<Icon component={GiPayMoney} />}
-                ),
+            onClick={() => {
-              },
+              setBillEnterContext({
-            ],
+                actions: {},
-          },
+                context: {},
-          {
+              });
-            key: "customers",
+            }}
-            icon: <UserOutlined />,
+          >
-            label: t("menus.header.customers"),
+            {t("menus.header.enterbills")}
-            children: [
+          </Menu.Item>
-              {
+          {Simple_Inventory.treatment === "on" && (
-                key: "owners",
+            <>
-                icon: <TeamOutlined />,
+              <Menu.Divider key="div4" />
-                label: (
+              <Menu.Item
-                  <Link to="/manage/owners">{t("menus.header.owners")}</Link>
+                key="inventory"
-                ),
+                icon={<Icon component={FaFileInvoiceDollar} />}
-              },
+              >
-              {
+                <Link to="/manage/inventory">
-                key: "vehicles",
+                  {t("menus.header.inventory")}
-                icon: <CarFilled />,
+                </Link>
-                label: (
+              </Menu.Item>
-                  <Link to="/manage/vehicles">
+            </>
-                    {t("menus.header.vehicles")}
+          )}
-                  </Link>
+          <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"
-            key: "ccs",
+            onClick={() => {
-            icon: <CarFilled />,
+              setPaymentContext({
-            label: t("menus.header.courtesycars"),
+                actions: {},
-            children: [
+                context: null,
-              {
+              });
-                key: "courtesycarsall",
+            }}
-                icon: <CarFilled />,
+            icon={<Icon component={FaCreditCard} />}
-                label: (
+          >
-                  <Link to="/manage/courtesycars">
+            {t("menus.header.enterpayment")}
-                    {t("menus.header.courtesycars-all")}
+          </Menu.Item>
-                  </Link>
+          <Menu.Divider key="div5" />
-                ),
+          <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
-              },
+            <Link to="/manage/timetickets">
-              {
+              {t("menus.header.timetickets")}
-                key: "contracts",
+            </Link>
-                icon: <FileFilled />,
+          </Menu.Item>
-                label: (
+          <Menu.Item
-                  <Link to="/manage/courtesycars/contracts">
+            key="entertimetickets"
-                    {t("menus.header.courtesycars-contracts")}
+            icon={<Icon component={GiPlayerTime} />}
-                  </Link>
+            onClick={() => {
-                ),
+              setTimeTicketContext({
-              },
+                actions: {},
-              {
+                context: {},
-                key: "newcontract",
+              });
-                icon: <FileAddFilled />,
+            }}
-                label: (
+          >
-                  <Link to="/manage/courtesycars/contracts/new">
+            {t("menus.header.entertimeticket")}
-                    {t("menus.header.courtesycars-newcontract")}
+          </Menu.Item>
-                  </Link>
+          <Menu.Divider key="div6" />
-                ),
+          <Menu.SubMenu
-              },
+            key="accountingexport"
-            ],
+            title={t("menus.header.export")}
-          },
+            icon={<ExportOutlined />}
-          {
+          >
-            key: "accounting",
+            <Menu.Item key="receivables">
-            icon: <DollarCircleFilled />,
+              <Link to="/manage/accounting/receivables">
-            label: t("menus.header.accounting"),
+                {t("menus.header.accounting-receivables")}
-            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>
-            ),
+            </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>
           {
-            key: "shopsubmenu",
+            //  <Menu.SubMenu
-            icon: <SettingOutlined />,
+            //           key="langselecter"
-            label: t("menus.header.shop"),
+            //           title={
-            children: [
+            //             <span>
-              {
+            //               <GlobalOutlined />
-                key: "shop",
+            //               <span>{t("menus.currentuser.languageselector")}</span>
-                icon: <Icon component={GiSettingsKnobs} />,
+            //             </span>
-                label: (
+            //           }
-                  <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
+            //         >
-                ),
+            //           <Menu.Item actiontype="lang-select" key="en-US">
-              },
+            //             {t("general.languages.english")}
-              {
+            //           </Menu.Item>
-                key: "dashboard",
+            //           <Menu.Item actiontype="lang-select" key="fr-CA">
-                icon: <DashboardFilled />,
+            //             {t("general.languages.french")}
-                label: (
+            //           </Menu.Item>
-                  <Link to="/manage/dashboard">
+            //           <Menu.Item actiontype="lang-select" key="es-MX">
-                    {t("menus.header.dashboard")}
+            //             {t("general.languages.spanish")}
-                  </Link>
+            //           </Menu.Item>
-                ),
+            //         </Menu.SubMenu>
-              },
+          }
-              {
+        </Menu.SubMenu>
-                key: "reportcenter",
+        <Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
-                icon: <BarChartOutlined />,
+          {recentItems.map((i, idx) => (
-                onClick: () => {
+            <Menu.Item key={idx}>
-                  setReportCenterContext({
+              <Link to={i.url}>{i.label}</Link>
-                    actions: {},
+            </Menu.Item>
-                    context: {},
+          ))}
-                  });
+        </Menu.SubMenu>
-                },
+      </Menu>
-                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: "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")
       }
-      open={visible}
+      visible={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 open={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
+      <Modal visible={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 { DownOutlined } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
-import { Dropdown, notification } from "antd";
 import React from "react";
+import { useMutation } from "@apollo/client";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { Dropdown, Menu, notification } from "antd";
+import { DownOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
@@ -37,19 +37,18 @@ export function JobAltTransportChange({ bodyshop, job }) {
       });
     }
   };
-  const menu = [
+  const menu = (
-    ...(bodyshop.appt_alt_transport &&
+    <Menu selectedKeys={[job && job.alt_transport]} onClick={onClick}>
-      bodyshop.appt_alt_transport.map((alt) => ({
+      {bodyshop.appt_alt_transport &&
-        key: alt,
+        bodyshop.appt_alt_transport.map((alt) => (
-        label: alt,
+          <Menu.Item key={alt}>{alt}</Menu.Item>
-        value: alt,
+        ))}
-        onClick,
+      <Menu.Divider />
-      }))),
+      <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
-    { type: "divider" },
+    </Menu>
-    { key: "null", label: t("general.actions.clear"), onClick },
+  );
-  ];
   return (
-    <Dropdown menu={{ items: menu }}>
+    <Dropdown overlay={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 { DownOutlined } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
-import { Dropdown, notification } from "antd";
 import React from "react";
+import { useMutation } from "@apollo/client";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import { Dropdown, Menu, notification } from "antd";
+import { DownOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
@@ -44,23 +44,21 @@ export function ScheduleEventColor({ bodyshop, event }) {
     bodyshop.appt_colors.filter((color) => color.color.hex === event.color)[0]
       ?.label;
 
-  const menu = {
+  const menu = (
-    items: [
+    <Menu selectedKeys={[event.color]} onClick={onClick}>
-      ...(bodyshop.appt_colors &&
+      {bodyshop.appt_colors &&
-        bodyshop.appt_colors.map((color) => ({
+        bodyshop.appt_colors.map((color) => (
-          style: { color: color.color.hex },
+          <Menu.Item style={{ color: color.color.hex }} key={color.color.hex}>
-          key: color.color.hex,
+            {color.label}
-          label: color.label,
+          </Menu.Item>
-        }))),
+        ))}
-      { type: "divider" },
+      <Menu.Divider />
-      { key: "null", value: t("general.actions.clear") },
+      <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
-    ],
+    </Menu>
-    selectedKeys: [event.color],
+  );
-    onClick: onClick,
-  };
 
   return (
-    <Dropdown menu={menu}>
+    <Dropdown overlay={menu}>
       <a href=" #" onClick={(e) => e.preventDefault()}>
         {selectedColor}
         <DownOutlined />

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

@@ -2,9 +2,11 @@ import { AlertFilled } from "@ant-design/icons";
 import {
   Button,
   Divider,
-  Dropdown, notification,
+  Dropdown,
+  Menu,
+  notification,
   Popover,
-  Space
+  Space,
 } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import moment from "moment";
@@ -16,7 +18,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";
@@ -25,11 +27,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,
@@ -147,12 +149,10 @@ export function ScheduleEventComponent({
         ) : null}
         {event.job ? (
           <Dropdown
-            menu={{
+            overlay={
-              items: [
+              <Menu>
-                {
+                <Menu.Item
-                  disabled: event.arrived,
+                  onClick={() => {
-                  label: t("general.labels.email"),
-                  onClick: () => {
                     const Template = TemplateList("job").appointment_reminder;
                     GenerateDocument(
                       {
@@ -166,12 +166,13 @@ export function ScheduleEventComponent({
                       "e",
                       event.job && event.job.id
                     );
-                  },
+                  }}
-                },
+                  disabled={event.arrived}
-                {
+                >
-                  label: t("general.labels.sms"),
+                  {t("general.labels.email")}
-                  disabled: event.arrived || !bodyshop.messagingservicesid,
+                </Menu.Item>
-                  onClick: () => {
+                <Menu.Item
+                  onClick={() => {
                     const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
                     if (p && p.isValid()) {
                       openChatByPhone({
@@ -191,10 +192,13 @@ 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>
@@ -245,7 +249,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,
@@ -283,8 +287,8 @@ export function ScheduleEventComponent({
 
   return (
     <Popover
-      open={visible}
+      visible={visible}
-      onOpenChange={(vis) => !event.vacation && setVisible(vis)}
+      onVisibleChange={(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
-    open={visible}
+      visible={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
-      open={!!selected}
+      visible={!!selected}
       destroyOnClose
       width={drawerPercentage}
       placement="right"

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

@@ -1,16 +1,24 @@
 import {
   DeleteFilled,
-  EditFilled,
   FilterFilled,
-  HomeOutlined,
-  MinusCircleTwoTone,
-  PlusCircleTwoTone,
   SyncOutlined,
   WarningFilled,
+  EditFilled,
+  PlusCircleTwoTone,
+  MinusCircleTwoTone,
+  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { PageHeader } from '@ant-design/pro-layout';
+import {
-import { Button, Dropdown, Input, Space, Table, Tag } from "antd";
+  Button,
+  Dropdown,
+  Input,
+  Menu,
+  PageHeader,
+  Space,
+  Table,
+  Tag,
+} from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -30,13 +38,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 _ from "lodash";
-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 _ from "lodash";
+import JobCreateIOU from "../job-create-iou/job-create-iou.component";
 import JobLinesExpander from "./job-lines-expander.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import moment from "moment";
+import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -95,9 +103,7 @@ export function JobLinesComponent({
       fixed: "left",
       key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
-      onCell: (record) => ({
+      onCell: (record) => ({ className: record.manual_line && "job-line-manual" }),
-        className: record.manual_line && "job-line-manual",
-      }),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
       ellipsis: true,
@@ -399,17 +405,16 @@ export function JobLinesComponent({
     }
   };
 
-  const markMenu = {
+  const markMenu = (
-    onClick: handleMark,
+    <Menu onClick={handleMark}>
-    items: [
+      <Menu.Item key="PAA">{t("joblines.fields.part_types.PAA")}</Menu.Item>
-      { key: "PAA", label: t("joblines.fields.part_types.PAA") },
+      <Menu.Item key="PAN">{t("joblines.fields.part_types.PAN")}</Menu.Item>
-      { key: "PAN", label: t("joblines.fields.part_types.PAN") },
+      <Menu.Item key="PAL">{t("joblines.fields.part_types.PAL")}</Menu.Item>
-      { key: "PAL", label: t("joblines.fields.part_types.PAL") },
+      <Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item>
-      { key: "PAS", label: t("joblines.fields.part_types.PAS") },
+      <Menu.Divider />
-      { type: "divider" },
+      <Menu.Item key="clear">{t("general.labels.clear")}</Menu.Item>
-      { key: "clear", label: t("general.labels.clear") },
+    </Menu>
-    ],
+  );
-  };
 
   return (
     <div>
@@ -539,7 +544,7 @@ export function JobLinesComponent({
             >
               <FilterFilled /> {t("jobs.actions.filterpartsonly")}
             </Button>
-            <Dropdown menu={markMenu} trigger={["click"]}>
+            <Dropdown overlay={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} open={visibility}>
+    <Popover destroyTooltipOnHide content={popContent} visible={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}
-          open={visibility}
+          visible={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -21,17 +21,19 @@ export function JoblinePresetButton({ bodyshop, form }) {
     form.setFieldsValue(item);
   };
 
-  const menu = {
+  const menu = (
-    items: bodyshop.md_jobline_presets.map((i, idx) => ({
+    <Menu>
-      onClick: () => handleSelect(i),
+      {bodyshop.md_jobline_presets.map((i, idx) => (
-      key: idx,
+        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
-      label: i.label,
+          {i.label}
-    })),
+        </Menu.Item>
-  };
+      ))}
+    </Menu>
+  );
 
   return (
     <div>
-      <Dropdown trigger={["click"]} menu={menu}>
+      <Dropdown trigger={["click"]} overlay={menu}>
         <a
           className="ant-dropdown-link"
           href="# "

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

@@ -54,7 +54,7 @@ export function JobLinesUpsertModalComponent({
           : t("joblines.labels.new")
       }
       forceRender
-      open={visible}
+      visible={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%"}
-      open={visible}
+      visible={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} open={visibility} placement="bottom">
+    <Popover content={overlay} visible={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, notification } from "antd";
+import { Button, Dropdown, Menu, notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -40,18 +40,20 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
       });
   };
 
-  const statusmenu = {
+  const statusmenu = (
-    onClick: (e) => {
+    <Menu
-      updateJobStatus(e.key);
+      onClick={(e) => {
-    },
+        updateJobStatus(e.key);
-    items: bodyshop.md_ro_statuses.statuses.map((item) => ({
+      }}
-      key: item,
+    >
-      label: item,
+      {bodyshop.md_ro_statuses.statuses.map((item) => (
-    })),
+        <Menu.Item key={item}>{item}</Menu.Item>
-  };
+      ))}
+    </Menu>
+  );
 
   return (
-    <Dropdown menu={statusmenu} trigger={["click"]} key="changestatus">
+    <Dropdown overlay={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, notification } from "antd";
+import { Button, Dropdown, Menu, notification } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -81,32 +81,29 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
     }
   }, [job, setAvailableStatuses, bodyshop]);
 
-  const statusmenu = {
+  const statusmenu = (
-    onClick: (e) => {
+    <Menu
-      updateJobStatus(e.key);
+      onClick={(e) => {
-    },
+        updateJobStatus(e.key);
-    items: [
+      }}
-      ...availableStatuses.map((item) => ({
+    >
-        key: item,
+      {availableStatuses.map((item) => (
-        label: item,
+        <Menu.Item key={item}>{item}</Menu.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
-      menu={statusmenu}
+      overlay={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 } from "antd";
+import { Button, Dropdown, Menu } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -62,17 +62,18 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     );
   };
 
-  const overlay = {
+  const overlay = (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
-    onClick: handleMenuClick,
+    <Menu onClick={handleMenuClick}>
-    items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
+      {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
-      label: mapping.name,
+        <Menu.Item disabled={disabled} key={mapping.name}>
-      key: mapping.name,
+          {mapping.name}
-      disabled: disabled,
+        </Menu.Item>
-    })),
+      ))}
-  };
+    </Menu>
+  );
 
   return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
-    <Dropdown menu={overlay}>
+    <Dropdown overlay={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 open={visible} content={popMenu}>
+    <Popover visible={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,17 +15,20 @@ export function JobsDetailChangeEstimator({ disabled, form, bodyshop }) {
     form.setFieldsValue(est);
   };
 
-  const menu = {
+  const menu = (
-    onClick: handleClick,
+    <div>
-    items: bodyshop.md_estimators.map((est, idx) => ({
+      <Menu onClick={handleClick}>
-      value: est,
+        {bodyshop.md_estimators.map((est, idx) => (
-      key: idx,
+          <Menu.Item value={est} key={idx}>
-      label: `${est.est_ct_fn || ""} ${est.est_ct_ln || ""}`.trim(),
+            {`${est.est_ct_fn} ${est.est_ct_ln}`}
-    })),
+          </Menu.Item>
-  };
+        ))}
+      </Menu>
+    </div>
+  );
 
   return (
-    <Dropdown menu={menu} disabled={disabled}>
+    <Dropdown overlay={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,21 +15,23 @@ export function JobsDetailChangeFilehandler({ disabled, form, bodyshop }) {
     form.setFieldsValue(est);
   };
 
-  const menu = {
+  const menu = (
-    onClick: handleClick,
+    <Menu
-    style: {
+      onClick={handleClick}
-      columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
+      style={{
-    },
+        columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
-    items: bodyshop.md_filehandlers.map((est, idx) => ({
+      }}
-      value: est,
+    >
-      key: idx,
+      {bodyshop.md_filehandlers.map((est, idx) => (
-      style: { breakInside: "avoid" },
+        <Menu.Item value={est} key={idx} style={{ breakInside: "avoid" }}>
-      label: `${est.ins_ct_fn || ""} ${est.ins_ct_ln || ""}`.trim(),
+          {`${est.ins_ct_fn} ${est.ins_ct_ln}`}
-    })),
+        </Menu.Item>
-  };
+      ))}
+    </Menu>
+  );
 
   return (
-    <Dropdown menu={menu} disabled={disabled}>
+    <Dropdown overlay={menu} disabled={disabled}>
       <a
         className="ant-dropdown-link"
         href=" #"

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

@@ -4,6 +4,7 @@ import {
   Card,
   Form,
   Input,
+  Menu,
   notification,
   Popover,
   Select,
@@ -12,11 +13,25 @@ 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";
 
-export default function JobsDetailHeaderAddEvent({ bodyshop, jobid }) {
+const mapStateToProps = createStructuredSelector({
+  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);
 
@@ -138,12 +153,11 @@ export default function JobsDetailHeaderAddEvent({ bodyshop, jobid }) {
     setVisibility(true);
   };
 
-  return {
+  return (
-    key: "addmanualevent",
+    <Popover content={overlay} visible={visibility}>
-    label: (
+      <Menu.Item {...props} onClick={handleClick}>
-      <Popover content={overlay} open={visibility} onClick={handleClick}>
         {t("appointments.labels.manualevent")}
-      </Popover>
+      </Menu.Item>
-    ),
+    </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, notification, Popconfirm } from "antd";
+import { Button, Dropdown, Menu, 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,14 +105,13 @@ export function JobsDetailHeaderActions({
     });
   };
 
-  const statusmenu = {
+  const statusmenu = (
-    items: [
+    <Menu key="popovermenu">
-      {
+      <Menu.Item
-        key: "schedule",
+        disabled={!jobInPreProduction || !job.converted || jobRO}
-        disabled: !jobInPreProduction || !job.converted || jobRO,
+        onClick={() => {
-        label: t("jobs.actions.schedule"),
-        onClick: () => {
           logImEXEvent("job_header_schedule");
+
           setScheduleContext({
             actions: { refetch: refetch },
             context: {
@@ -121,228 +120,200 @@ export function JobsDetailHeaderActions({
               alt_transport: job.alt_transport,
             },
           });
-        },
+        }}
-      },
+      >
-      {
+        {t("jobs.actions.schedule")}
-        key: "cancelappts",
+      </Menu.Item>
-        disabled: job.status !== bodyshop.md_ro_statuses.default_scheduled,
+      <Menu.Item
-        label: (
+        disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          <Popconfirm
+      >
-            title={t("general.labels.areyousure")}
+        <Popconfirm
-            okText="Yes"
+          title={t("general.labels.areyousure")}
-            cancelText="No"
+          okText="Yes"
-            onClick={(e) => e.stopPropagation()}
+          cancelText="No"
-            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+          onClick={(e) => e.stopPropagation()}
-            onConfirm={async () => {
+          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-              const jobUpdate = await cancelAllAppointments({
+          onConfirm={async () => {
-                variables: {
+            const jobUpdate = await cancelAllAppointments({
-                  jobid: job.id,
+              variables: {
-                  job: {
+                jobid: job.id,
-                    date_scheduled: null,
+                job: {
-                    scheduled_in: null,
+                  date_scheduled: null,
-                    scheduled_completion: null,
+                  scheduled_in: null,
-                    status: bodyshop.md_ro_statuses.default_imported,
+                  scheduled_completion: null,
-                  },
+                  status: bodyshop.md_ro_statuses.default_imported,
                 },
+              },
+            });
+            if (!jobUpdate.errors) {
+              notification["success"]({
+                message: t("appointments.successes.canceled"),
               });
-              if (!jobUpdate.errors) {
+              return;
-                notification["success"]({
+            }
-                  message: t("appointments.successes.canceled"),
+          }}
-                });
+          getPopupContainer={(trigger) => trigger.parentNode}
-                return;
+        >
-              }
+          {t("menus.jobsactions.cancelallappointments")}
-            }}
+        </Popconfirm>
-            getPopupContainer={(trigger) => trigger.parentNode}
+      </Menu.Item>
-          >
+      <Menu.Item
-            {t("menus.jobsactions.cancelallappointments")}
+        disabled={
-          </Popconfirm>
-        ),
-      },
-      {
-        key: "intake",
-        disabled:
           !!job.intakechecklist ||
           !jobInPreProduction ||
           !job.converted ||
-          jobRO,
+          jobRO
-        label:
+        }
-          !!job.intakechecklist ||
+      >
-          !jobInPreProduction ||
+        {!!job.intakechecklist ||
-          !job.converted ||
+        !jobInPreProduction ||
-          jobRO ? (
+        !job.converted ||
-            t("jobs.actions.intake")
+        jobRO ? (
-          ) : (
+          t("jobs.actions.intake")
-            <Link to={`/manage/jobs/${job.id}/intake`}>
+        ) : (
-              {t("jobs.actions.intake")}
+          <Link to={`/manage/jobs/${job.id}/intake`}>
-            </Link>
+            {t("jobs.actions.intake")}
-          ),
+          </Link>
-      },
+        )}
-      {
+      </Menu.Item>
-        disabled: !jobInProduction || jobRO,
+      <Menu.Item disabled={!jobInProduction || jobRO}>
-        key: "deliver",
+        {!jobInProduction ? (
-        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}>
-        key: "viewchecklist",
+        <Link to={`/manage/jobs/${job.id}/checklist`}>
-        disabled: !job.converted,
+          {t("jobs.actions.viewchecklist")}
-        label: (
+        </Link>
-          <Link to={`/manage/jobs/${job.id}/checklist`}>
+      </Menu.Item>
-            {t("jobs.actions.viewchecklist")}
+      <Menu.Item
-          </Link>
+        key="entertimetickets"
-        ),
+        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>
-        key: "enterpayments",
+      <Menu.Item
-        disabled: !job.converted,
+        key="enterpayments"
-        label: t("menus.header.enterpayment"),
+        disabled={!job.converted}
-        onClick: () => {
+        onClick={() => {
           logImEXEvent("job_header_enter_payment");
 
           setPaymentContext({
             actions: {},
             context: { jobid: job.id },
           });
-        },
+        }}
-      },
+      >
-      {
+        {t("menus.header.enterpayment")}
-        key: "cccontract",
+      </Menu.Item>
-        disabled: jobRO || !job.converted,
+      <Menu.Item key="cccontract" disabled={jobRO || !job.converted}>
-        label: (
+        <Link
-          <Link
+          to={{
-            to={{
+            pathname: "/manage/courtesycars/contracts/new",
-              pathname: "/manage/courtesycars/contracts/new",
+            state: { jobId: job.id },
-              state: { jobId: job.id },
+          }}
-            }}
+        >
-          >
+          {t("menus.jobsactions.newcccontract")}
-            {t("menus.jobsactions.newcccontract")}
+        </Link>
-          </Link>
+      </Menu.Item>
-        ),
+      {job.inproduction ? (
-      },
+        <Menu.Item
-      ...(job.inproduction
+          key="addtoproduction"
-        ? [
+          disabled={!job.converted}
-            {
+          onClick={() => AddToProduction(client, job.id, refetch, true)}
-              key: "removetoproduction",
+        >
-              disabled: !job.converted,
+          {t("jobs.actions.removefromproduction")}
-              onClick: () => AddToProduction(client, job.id, refetch, true),
+        </Menu.Item>
-              label: t("jobs.actions.removefromproduction"),
+      ) : (
-            },
+        <Menu.Item
-          ]
+          key="addtoproduction"
-        : [
+          disabled={!job.converted}
-            {
+          onClick={() => AddToProduction(client, job.id, refetch)}
-              key: "addtoproduction",
+        >
-              disabled: !job.converted,
+          {t("jobs.actions.addtoproduction")}
-              onClick: () => AddToProduction(client, job.id, refetch),
+        </Menu.Item>
-              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}>
-        key: "toggleAlert",
+        {job.production_vars && job.production_vars.alert
-        onClick: handleAlertToggle,
+          ? t("production.labels.alertoff")
-        label:
+          : t("production.labels.alerton")}
-          job.production_vars && job.production_vars.alert
+      </Menu.Item>
-            ? t("production.labels.alertoff")
+      <Menu.SubMenu key="dupe" title={t("menus.jobsactions.duplicate")}>
-            : t("production.labels.alerton"),
+        <Menu.Item>
-      },
+          <Popconfirm
-      {
+            title={t("jobs.labels.duplicateconfirm")}
-        key: "dupe",
+            okText="Yes"
-        label: t("menus.jobsactions.duplicate"),
+            cancelText="No"
-        children: [
+            onClick={(e) => e.stopPropagation()}
-          {
+            onConfirm={() =>
-            key: "dupewithlines",
+              DuplicateJob(
-            label: (
+                client,
-              <Popconfirm
+                job.id,
-                title={t("jobs.labels.duplicateconfirm")}
+                { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
-                okText="Yes"
+                (newJobId) => {
-                cancelText="No"
+                  history.push(`/manage/jobs/${newJobId}`);
-                onClick={(e) => e.stopPropagation()}
+                  notification["success"]({
-                onConfirm={() =>
+                    message: t("jobs.successes.duplicated"),
-                  DuplicateJob(
+                  });
-                    client,
+                },
-                    job.id,
+                true
-                    {
+              )
-                      defaultOpenStatus:
+            }
-                        bodyshop.md_ro_statuses.default_imported,
+            getPopupContainer={(trigger) => trigger.parentNode}
-                    },
+          >
-                    (newJobId) => {
+            {t("menus.jobsactions.duplicate")}
-                      history.push(`/manage/jobs/${newJobId}`);
+          </Popconfirm>
-                      notification["success"]({
+        </Menu.Item>
-                        message: t("jobs.successes.duplicated"),
+        <Menu.Item>
-                      });
+          <Popconfirm
-                    },
+            title={t("jobs.labels.duplicateconfirm")}
-                    true
+            okText="Yes"
-                  )
+            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.duplicate")}
+            getPopupContainer={(trigger) => trigger.parentNode}
-              </Popconfirm>
+          >
-            ),
+            {t("menus.jobsactions.duplicatenolines")}
-          },
+          </Popconfirm>
-          {
+        </Menu.Item>
-            key: "dupewithoutlines",
+      </Menu.SubMenu>
-            label: (
+
-              <Popconfirm
+      <Menu.Item
-                title={t("jobs.labels.duplicateconfirm")}
+        key="postbills"
-                okText="Yes"
+        disabled={!job.converted}
-                cancelText="No"
+        onClick={() => {
-                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({
@@ -351,13 +322,14 @@ export function JobsDetailHeaderActions({
               job: job,
             },
           });
-        },
+        }}
-      },
+      >
-      {
+        {t("jobs.actions.postbills")}
-        key: "addtopartsqueue",
+      </Menu.Item>
-        disabled: !job.converted || !jobInProduction || jobRO,
+      <Menu.Item
-        label: t("jobs.actions.addtopartsqueue"),
+        key="addtopartsqueue"
-        onClick: async () => {
+        disabled={!job.converted || !jobInProduction || jobRO}
+        onClick={async () => {
           const result = await updateJob({
             variables: {
               jobId: job.id,
@@ -376,12 +348,12 @@ export function JobsDetailHeaderActions({
               }),
             });
           }
-        },
+        }}
-      },
+      >
-      {
+        {t("jobs.actions.addtopartsqueue")}
-        disabled: !jobInPostProduction,
+      </Menu.Item>
-        key: "closejob",
+      <Menu.Item disabled={!jobInPostProduction} key="closejob">
-        label: !jobInPostProduction ? (
+        {!jobInPostProduction ? (
           t("menus.jobsactions.closejob")
         ) : (
           <Link
@@ -391,27 +363,23 @@ export function JobsDetailHeaderActions({
           >
             {t("menus.jobsactions.closejob")}
           </Link>
-        ),
+        )}
-      },
+      </Menu.Item>
-      {
+      <Menu.Item key="admin">
-        key: "admin",
+        <Link
-        label: (
+          to={{
-          <Link
+            pathname: `/manage/jobs/${job.id}/admin`,
-            to={{
+          }}
-              pathname: `/manage/jobs/${job.id}/admin`,
+        >
-            }}
+          {t("menus.jobsactions.admin")}
-          >
+        </Link>
-            {t("menus.jobsactions.admin")}
+      </Menu.Item>
-          </Link>
+      <JobsDetailHeaderActionsExportcustdataComponent job={job} />
-        ),
+      <JobsDetaiLheaderCsi job={job} />
-      },
+      <Menu.Item
-      JobsDetailHeaderActionsExportcustdataComponent({ bodyshop, job }),
+        key="jobcosting"
-      JobsDetaiLheaderCsi({ job, bodyshop }),
+        disabled={!job.converted}
-      {
+        onClick={() => {
-        key: "jobcosting",
-        label: t("jobs.labels.jobcosting"),
-        disabled: !job.converted,
-        onClick: () => {
           logImEXEvent("job_header_job_costing");
           setJobCostingContext({
             actions: { refetch: refetch },
@@ -419,108 +387,96 @@ export function JobsDetailHeaderActions({
               jobId: job.id,
             },
           });
-        },
+        }}
-      },
+      >
-      ...(job && !job.converted
+        {t("jobs.labels.jobcosting")}
-        ? [
+      </Menu.Item>
-            {
+      {job && !job.converted && (
-              key: "deletejob",
+        <Menu.Item>
-              label: (
+          <Popconfirm
-                <Popconfirm
+            title={t("jobs.labels.deleteconfirm")}
-                  title={t("jobs.labels.deleteconfirm")}
+            okText={t("general.labels.yes")}
-                  okText={t("general.labels.yes")}
+            cancelText={t("general.labels.no")}
-                  cancelText={t("general.labels.no")}
+            onClick={(e) => e.stopPropagation()}
-                  onClick={(e) => e.stopPropagation()}
+            onConfirm={async () => {
-                  onConfirm={async () => {
+              //delete the job.
-                    //delete the job.
+              const result = await deleteJob({ variables: { id: job.id } });
-                    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 && (
-      ///////HEADER ADD EVENT ITEM
+        <Menu.Item>
-      JobsDetailHeaderActionsAddevent({ jobid: job.id, bodyshop }),
+          <Popconfirm
-      ...(!jobRO && job.converted
+            title={t("jobs.labels.voidjob")}
-        ? [
+            okText="Yes"
-            {
+            cancelText="No"
-              key: "voidjob",
+            onClick={(e) => e.stopPropagation()}
-              label: (
+            onConfirm={async () => {
-                <Popconfirm
+              //delete the job.
-                  title={t("jobs.labels.voidjob")}
+              const result = await voidJob({
-                  okText="Yes"
+                variables: {
-                  cancelText="No"
+                  jobId: job.id,
-                  onClick={(e) => e.stopPropagation()}
+                  job: {
-                  onConfirm={async () => {
+                    status: bodyshop.md_ro_statuses.default_void,
-                    //delete the job.
+                    voided: true,
-                    const result = await voidJob({
+                    scheduled_in: null,
-                      variables: {
+                    scheduled_completion: null,
-                        jobId: job.id,
+                    inproduction: false,
-                        job: {
+                  },
-                          status: bodyshop.md_ro_statuses.default_void,
+                  note: [
-                          voided: true,
+                    {
-                          scheduled_in: null,
+                      jobid: job.id,
-                          scheduled_completion: null,
+                      created_by: currentUser.email,
-                          inproduction: false,
+                      audit: true,
-                        },
+                      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 menu={statusmenu} trigger={["click"]} key="changestatus">
+    <Dropdown overlay={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,8 +1,11 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { notification } from "antd";
+import { Menu, 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,
@@ -13,14 +16,30 @@ import {
   openChatByPhone,
   setMessage,
 } from "../../redux/messaging/messaging.actions";
-import { store } from "../../redux/store";
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import i18n from "../../translations/i18n";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
-export default function JobsDetailHeaderCsi({ bodyshop, job }) {
+const mapStateToProps = createStructuredSelector({
-  const { t } = i18n;
+  //currentUser: selectCurrentUser'
+  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();
 
@@ -78,35 +97,29 @@ export default function JobsDetailHeaderCsi({ bodyshop, job }) {
           return;
         }
         if (e.key === "email")
-          store.dispatch(
+          setEmailOptions({
-            setEmailOptions({
+            jobid: job.id,
-              jobid: job.id,
+            messageOptions: {
-              messageOptions: {
+              to: [job.ownr_ea],
-                to: [job.ownr_ea],
+              replyTo: bodyshop.email,
-                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()) {
-            store.dispatch(
+            openChatByPhone({
-              openChatByPhone({
+              phone_num: p.formatInternational(),
-                phone_num: p.formatInternational(),
+              jobid: job.id,
-                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"]({
@@ -127,35 +140,29 @@ export default function JobsDetailHeaderCsi({ bodyshop, job }) {
       }
     } else {
       if (e.key === "email")
-        store.dispatch(
+        setEmailOptions({
-          setEmailOptions({
+          jobid: job.id,
-            jobid: job.id,
+          messageOptions: {
-            messageOptions: {
+            to: [job.ownr_ea],
-              to: [job.ownr_ea],
+            replyTo: bodyshop.email,
-              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()) {
-          store.dispatch(
+          openChatByPhone({
-            openChatByPhone({
+            phone_num: p.formatInternational(),
-              phone_num: p.formatInternational(),
+            jobid: job.id,
-              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"]({
@@ -173,51 +180,61 @@ export default function JobsDetailHeaderCsi({ bodyshop, job }) {
     }
   };
 
-  if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return {};
+  if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return <></>;
 
-  return {
+  return (
-    key: "sendcsi",
+    <Menu.SubMenu
-    label: t("jobs.actions.sendcsi"),
+      key="sendcsi"
-    children: [
+      title={t("jobs.actions.sendcsi")}
-      {
+      disabled={!job.converted}
-        key: "email",
+      {...props}
-        onClick: handleCreateCsi,
+    >
-        disabled: !!!job.ownr_ea,
+      <Menu.Item
-        label: t("general.labels.email"),
+        onClick={handleCreateCsi}
-      },
+        key="email"
-      {
+        disabled={!!!job.ownr_ea}
-        onClick: handleCreateCsi,
+      >
-        key: "text",
+        {t("general.labels.email")}
-        disabled: !!!job.ownr_ph1,
+      </Menu.Item>
-        label: t("general.labels.text"),
+      <Menu.Item
-      },
+        onClick={handleCreateCsi}
-      {
+        key="text"
-        key: "generate",
+        disabled={!!!job.ownr_ph1}
-        onClick: handleCreateCsi,
+      >
-        disabled: job.csiinvites && job.csiinvites.length > 0,
+        {t("general.labels.text")}
-        label: t("jobs.actions.generatecsi"),
+      </Menu.Item>
-      },
+      <Menu.Item
-      { type: "divider" },
+        onClick={handleCreateCsi}
-      ...job.csiinvites.map((item, idx) => {
+        key="generate"
-        return item.completedon
+        disabled={job.csiinvites && job.csiinvites.length > 0}
-          ? {
+      >
-              key: idx,
+        {t("jobs.actions.generatecsi")}
-              label: (
+      </Menu.Item>
-                <Link to={`/manage/shop/csi?responseid=${item.id}`}>
+      <Menu.Divider />
-                  <DateTimeFormatter>{item.completedon}</DateTimeFormatter>
+      {job.csiinvites.map((item, idx) => {
-                </Link>
+        return item.completedon ? (
-              ),
+          <Menu.Item key={idx}>
-            }
+            <Link to={`/manage/shop/csi?responseid=${item.id}`}>
-          : {
+              <DateTimeFormatter>{item.completedon}</DateTimeFormatter>
-              key: idx,
+            </Link>
-              onClick: () => {
+          </Menu.Item>
-                navigator.clipboard.writeText(
+        ) : (
-                  `${window.location.protocol}//${window.location.host}/csi/${item.id}`
+          <Menu.Item
-                );
+            key={idx}
-              },
+            onClick={() => {
-              label: t("general.actions.copylink"),
+              navigator.clipboard.writeText(
-            };
+                `${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,13 +1,23 @@
-import { notification } from "antd";
+import { Menu, notification } from "antd";
 import axios from "axios";
-import i18next from "i18next";
+import React from "react";
+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";
 
-export default function JobsDetailHeaderActionexportCustomerData({
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export function JobsDetailHeaderActionexportCustomerData({
   bodyshop,
   job,
+  ...props
 }) {
-  const { t } = i18next;
+  const { t } = useTranslation();
 
   const handleExportCustData = async (e) => {
     logImEXEvent("job_export_cust_data");
@@ -90,20 +100,18 @@ export default function JobsDetailHeaderActionexportCustomerData({
     }
   };
 
-  return {
+  return (
-    onClick: handleExportCustData,
+    <Menu.Item
-    key: "exportcustdata",
+      {...props}
-    disabled: !job.converted,
+      onClick={handleExportCustData}
-    label: t("jobs.actions.exportcustdata"),
+      key="exportcustdata"
-  };
+      disabled={!job.converted}
-  // (
+    >
-  //   <Menu.Item
+      {t("jobs.actions.exportcustdata")}
-  //     {...props}
+    </Menu.Item>
-  //     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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -18,16 +18,20 @@ export function JobsDetailRatesChangeButton({ disabled, form, bodyshop }) {
     form.setFieldsValue({ ...rate, labor_rate_desc: rate.rate_label });
   };
 
-  const menu = {
+  const menu = (
-    onClick: handleClick,
+    <div>
-    items: bodyshop.md_labor_rates.map((rate, idx) => ({
+      <Menu onClick={handleClick}>
-      key: idx,
+        {bodyshop.md_labor_rates.map((rate, idx) => (
-      value: rate,
+          <Menu.Item value={rate} key={idx}>
-      label: rate.rate_label,
+            {rate.rate_label}
-    })),
+          </Menu.Item>
-  };
+        ))}
+      </Menu>
+    </div>
+  );
+
   return (
-    <Dropdown menu={menu} disabled={disabled}>
+    <Dropdown overlay={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,42 +69,44 @@ 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, {
+
-        //   create: true,
+        const directory = await parentDir.getDirectoryHandle(identifier, {
-        // });
+          create: true,
-        // yauzl.fromBuffer(
+        });
-        //   Buffer.from(theDownloadedZip.data),
+
-        //   {},
+        yauzl.fromBuffer(
-        //   (err, zipFile) => {
+          Buffer.from(theDownloadedZip.data),
-        //     if (err) throw err;
+          {},
-        //     zipFile.on("entry", (entry) => {
+          (err, zipFile) => {
-        //       zipFile.openReadStream(entry, async (readErr, readStream) => {
+            if (err) throw err;
-        //         if (readErr) {
+            zipFile.on("entry", (entry) => {
-        //           zipFile.close();
+              zipFile.openReadStream(entry, async (readErr, readStream) => {
-        //           throw readErr;
+                if (readErr) {
-        //         }
+                  zipFile.close();
-        //         if (err) throw err;
+                  throw readErr;
-        //         let fileSystemHandle = await directory.getFileHandle(
+                }
-        //           entry.fileName,
+                if (err) throw err;
-        //           {
+                let fileSystemHandle = await directory.getFileHandle(
-        //             create: true,
+                  entry.fileName,
-        //           }
+                  {
-        //         );
+                    create: true,
-        //         const writable = await fileSystemHandle.createWritable();
+                  }
-        //         readStream.on("data", async function (chunk) {
+                );
-        //           await writable.write(chunk);
+                const writable = await fileSystemHandle.createWritable();
-        //         });
+                readStream.on("data", async function (chunk) {
-        //         readStream.on("end", async function () {
+                  await writable.write(chunk);
-        //           await writable.close();
+                });
-        //         });
+                readStream.on("end", async function () {
-        //       });
+                  await writable.close();
-        //     });
+                });
-        //   }
+              });
-        // );
+            });
+          }
+        );
       } catch (e) {
         console.log(e);
         standardMediaDownload(theDownloadedZip.data);
@@ -121,7 +123,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} open={visible}>
+    <Popover content={popContent} visible={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,8 +10,7 @@ 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,
@@ -24,7 +23,11 @@ function JobsDocumentsComponent({
 }) {
   const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
   const { t } = useTranslation();
-  const [modalState, setModalState] = useState({ open: false, index: 0 });
+  const [index, setIndex] = useState(0);
+
+  const onCurrentImageChange = (index) => {
+    setIndex(index);
+  };
 
   useEffect(() => {
     let documents = data.reduce(
@@ -32,12 +35,10 @@ 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),
-            fullsize: GenerateSrcUrl(value),
+            thumbnailHeight: 225,
-            src: GenerateThumbUrl(value),
+            thumbnailWidth: 225,
-            height: 225,
-            width: 225,
             isSelected: false,
             key: value.key,
             extension: value.extension,
@@ -61,8 +62,8 @@ function JobsDocumentsComponent({
           const fileName = value.key.split("/").pop();
           acc.other.push({
             source: GenerateSrcUrl(value),
-            //src: "",
+            src: "",
-            src: thumb,
+            thumbnail: thumb,
             tags: [
               {
                 value: fileName,
@@ -84,8 +85,8 @@ function JobsDocumentsComponent({
                   ]
                 : []),
             ],
-            height: 225,
+            thumbnailHeight: 225,
-            width: 225,
+            thumbnailWidth: 225,
             isSelected: false,
 
             extension: value.extension,
@@ -147,15 +148,35 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-images")}>
             <Gallery
               images={galleryImages.images}
-              onClick={(index, item) => {
+              backdropClosesModal={true}
-                setModalState({ open: true, index: index });
+              currentImageWillChange={onCurrentImageChange}
-                // window.open(
+              customControls={[
-                //   item.fullsize,
+                <Button
-                //   "_blank",
+                  key="edit-button"
-                //   "toolbar=0,location=0,menubar=0"
+                  style={{
-                // );
+                    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"
+                );
               }}
-              onSelect={(index, image) => {
+              onSelectImage={(index, image) => {
                 setgalleryImages({
                   ...galleryImages,
                   images: galleryImages.images.map((g, idx) =>
@@ -170,6 +191,8 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-other")}>
             <Gallery
               images={galleryImages.other}
+              backdropClosesModal={true}
+              enableLightbox={false}
               thumbnailStyle={() => {
                 return {
                   backgroundImage: <FileExcelFilled />,
@@ -178,14 +201,14 @@ function JobsDocumentsComponent({
                   cursor: "pointer",
                 };
               }}
-              onClick={(index) => {
+              onClickThumbnail={(index) => {
                 window.open(
                   galleryImages.other[index].source,
                   "_blank",
                   "toolbar=0,location=0,menubar=0"
                 );
               }}
-              onSelect={(index) => {
+              onSelectImage={(index) => {
                 setgalleryImages({
                   ...galleryImages,
                   other: galleryImages.other.map((g, idx) =>
@@ -197,53 +220,6 @@ 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, useState } from "react";
+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";
@@ -18,8 +18,6 @@ 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,
@@ -51,7 +49,6 @@ export function JobsDocumentsLocalGallery({
   vendorid,
 }) {
   const { t } = useTranslation();
-  const [modalState, setModalState] = useState({ open: false, index: 0 });
   useEffect(() => {
     if (job) {
       if (invoice_number) {
@@ -61,7 +58,6 @@ export function JobsDocumentsLocalGallery({
       }
     }
   }, [job, invoice_number, getJobMedia, getBillMedia]);
-
   let optimized;
   const jobMedia =
     allMedia && allMedia[job.id]
@@ -74,20 +70,12 @@ 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 }],
               });
             }
@@ -132,7 +120,8 @@ export function JobsDocumentsLocalGallery({
       <Card title={t("jobs.labels.documents-images")}>
         <Gallery
           images={jobMedia.images}
-          onSelect={(index, image) => {
+          backdropClosesModal={true}
+          onSelectImage={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
           {...(optimized && {
@@ -144,23 +133,24 @@ export function JobsDocumentsLocalGallery({
               />,
             ],
           })}
-          onClick={(index, item) => {
+          onClickImage={(props) => {
-            setModalState({ open: true, index: index });
+            const media = allMedia[job.id].find(
-            // const media = allMedia[job.id].find(
+              (m) => m.optimized === props.target.src
-            //   (m) => m.optimized === item.src
+            );
-            // );
 
-            // window.open(
+            window.open(
-            //   media ? media.fullsize : item.fullsize,
+              media ? media.src : props.target.src,
-            //   "_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 />,
@@ -169,48 +159,18 @@ export function JobsDocumentsLocalGallery({
               cursor: "pointer",
             };
           }}
-          onClick={(index) => {
+          onClickThumbnail={(index) => {
             window.open(
-              jobMedia.other[index].fullsize,
+              jobMedia.other[index].src,
               "_blank",
               "toolbar=0,location=0,menubar=0"
             );
           }}
-          onSelect={(index, image) => {
+          onSelectImage={(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, src: val.thumbnail });
+              acc.push(val);
             }
             return acc;
           }, [])
@@ -65,6 +65,7 @@ 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} open={visible}>
+    <Popover content={popContent} visible={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
-      open={visible}
+      visible={visible}
-      onOpenChange={(vis) => setVisible(vis)}
+      onVisibleChange={(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")}
-      open={visible}
+      visible={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -21,21 +21,27 @@ export function NotesPresetButton({ bodyshop, form }) {
     form.setFieldsValue({ text: item.text });
   };
 
-  const menu = {
+  const menu = (
-    style: {
+    <Menu
-      columnCount: Math.floor(bodyshop.md_notes_presets.length / 10) + 1,
+      style={{
-    },
+        columnCount: Math.floor(bodyshop.md_notes_presets.length / 10) + 1,
-    items: bodyshop.md_notes_presets.map((i, idx) => ({
+      }}
-      key: idx,
+    >
-      style: { breakInside: "avoid" },
+      {bodyshop.md_notes_presets.map((i, idx) => (
-      onClick: () => handleSelect(i),
+        <Menu.Item
-      label: i.label,
+          onClick={() => handleSelect(i)}
-    })),
+          key={idx}
-  };
+          style={{ breakInside: "avoid" }}
+        >
+          {i.label}
+        </Menu.Item>
+      ))}
+    </Menu>
+  );
 
   return (
     <div>
-      <Dropdown trigger={["click"]} menu={menu}>
+      <Dropdown trigger={["click"]} overlay={menu}>
         <a
           className="ant-dropdown-link"
           href="# "

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

@@ -1,5 +1,4 @@
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, notification, PageHeader } from "antd";
-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}
-      open={visibility}
+      visible={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}
-      open={visibility}
+      visible={visibility}
       disabled={disabled}
     >
       <Button loading={loading} onClick={handlePopover}>

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

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

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

@@ -1,11 +1,17 @@
-import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
+import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Checkbox, Divider, Dropdown, Form,
+  Divider,
+  Form,
   Input,
   InputNumber,
-  Radio, Select, Space,
+  Radio,
-  Tag
+  Space,
+  Tag,
+  Select,
+  Menu,
+  Dropdown,
+  Checkbox,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -55,14 +61,17 @@ export function PartsOrderModalComponent({
     form.setFieldsValue({ comments: item.props.value });
   };
 
-  const menu = {
+  const menu = (
-    onClick: handleClick,
+    <div>
-    items: bodyshop.md_parts_order_comment.map((comment, idx) => ({
+      <Menu onClick={handleClick}>
-      key: idx,
+        {bodyshop.md_parts_order_comment.map((comment, idx) => (
-      value: comment.comment,
+          <Menu.Item value={comment.comment} key={idx}>
-      label: comment.label,
+            {comment.label}
-    })),
+          </Menu.Item>
-  };
+        ))}
+      </Menu>
+    </div>
+  );
 
   return (
     <div>
@@ -299,7 +308,7 @@ export function PartsOrderModalComponent({
         label={
           <Space>
             {t("parts_orders.fields.comments")}
-            <Dropdown menu={menu}>
+            <Dropdown overlay={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
-    open={visible}
+      visible={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
-    open={visible}
+      visible={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
-      open={visible}
+      visible={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
-    open={visible}
+      visible={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")
       }
-      open={visible}
+      visible={visible}
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"

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

@@ -1,5 +1,4 @@
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Form, Input, PageHeader, Space } from "antd";
-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} open={isModalVisible}>
+    <Popover content={content} visible={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
-    open={visible}
+      visible={visible}
       onOk={() => toggleModalVisible()}
       onCancel={() => toggleModalVisible()}
       cancelButtonProps={{ style: { display: "none" } }}

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

@@ -1,5 +1,4 @@
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, List, PageHeader } from "antd";
-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} open={visible}>
+    <Popover content={overlay} visible={visible}>
       <Button loading={loading} onClick={() => setVisible(true)}>
         {t("production.labels.cardsettings")}
       </Button>

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

@@ -1,8 +1,7 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import Board, { moveCard } from "@asseinfo/react-kanban";
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Grid, notification, PageHeader, Space, Statistic } from "antd";
-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 { useTranslation } from "react-i18next";
+import { Button, Dropdown, Menu } from "antd";
 import dataSource from "./production-list-columns.data";
+import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -47,24 +47,37 @@ export function ProductionColumnsComponent({
     state: tableState,
     activeStatuses: bodyshop.md_ro_statuses.active_statuses,
   });
-  const menu = {
+  const menu = (
-    style: {
+    <Menu
-      columnCount: Math.max(Math.floor(cols.length / 10), 1),
+      onClick={handleAdd}
-    },
+      style={{
-    onClick: handleAdd,
+        columnCount: Math.max(Math.floor(cols.length / 10), 1),
-    items: cols
+      }}
-      .filter((i) => !columnKeys.includes(i.key))
+    >
-      .map((item) => ({
+      {cols
-        key: item.key,
+        .filter((i) => !columnKeys.includes(i.key))
-        style: { breakInside: "avoid" },
+        .map((item) => (
-        label: item.title,
+          <Menu.Item key={item.key} style={{ breakInside: "avoid" }}>
-      })),
+            {item.title}
-  };
+          </Menu.Item>
+        ))}
+    </Menu>
+  );
   return (
     <div>
-      <Dropdown menu={menu}>
+      <Dropdown overlay={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 { useMutation } from "@apollo/client";
+import { Dropdown, Menu } from "antd";
-import { Dropdown } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { logImEXEvent } from "../../firebase/firebase.utils";
+import { useMutation } from "@apollo/client";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnAlert({ record }) {
   const { t } = useTranslation();
@@ -34,18 +34,15 @@ export default function ProductionListColumnAlert({ record }) {
 
   return (
     <Dropdown
-      menu={{
+      overlay={
-        items: [
+        <Menu>
-          {
+          <Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
-            key: "toggleAlert",
+            {record.production_vars && record.production_vars.alert
-            onClick: handleAlertToggle,
+              ? t("production.labels.alertoff")
-            label:
+              : t("production.labels.alerton")}
-              record.production_vars && record.production_vars.alert
+          </Menu.Item>
-                ? t("production.labels.alertoff")
+        </Menu>
-                : 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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnBodyPriority({ record }) {
   const { t } = useTranslation();
@@ -31,27 +31,25 @@ export default function ProductionListColumnBodyPriority({ record }) {
 
   return (
     <Dropdown
-      menu={{
+      overlay={
-        onClick: handleSetBodyPriority,
+        <Menu onClick={handleSetBodyPriority}>
-        items: [
+          <Menu.Item key="clearBodyPriority">
-          {
+            {t("production.actions.bodypriority-clear")}
-            key: "clearBodyPriority",
+          </Menu.Item>
-            label: t("production.actions.bodypriority-clear"),
+          <Menu.SubMenu
-          },
+            key="set"
-          {
+            title={t("production.actions.bodypriority-set")}
-            key: "set",
+          >
-            label: t("production.actions.bodypriority-set"),
+            {new Array(15).fill().map((value, index) => (
-            children: new Array(15).fill().map((value, index) => ({
+              <Menu.Item key={index + 1}>
-              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
-      onOpenChange={handleVisibleChange}
+      onVisibleChange={handleVisibleChange}
-      open={visible}
+      visible={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"]}
-      open={visible}
+      visible={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnDetailPriority({ record }) {
   const { t } = useTranslation();
@@ -31,27 +31,25 @@ export default function ProductionListColumnDetailPriority({ record }) {
 
   return (
     <Dropdown
-      menu={{
+      overlay={
-        onClick: handleSetDetailPriority,
+        <Menu onClick={handleSetDetailPriority}>
-        items: [
+          <Menu.Item key="clearDetailPriority">
-          {
+            {t("production.actions.detailpriority-clear")}
-            key: "clearDetailPriority",
+          </Menu.Item>
-            label: t("production.actions.detailpriority-clear"),
+          <Menu.SubMenu
-          },
+            key="set"
-          {
+            title={t("production.actions.detailpriority-set")}
-            key: "set",
+          >
-            label: t("production.actions.detailpriority-set"),
+            {new Array(15).fill().map((value, index) => (
-            children: new Array(15).fill().map((value, index) => ({
+              <Menu.Item key={index + 1}>
-              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} open={visibility}>
+    <Popover destroyTooltipOnHide content={popContent} visible={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"]}
-        open={visible}
+        visible={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 } from "antd";
+import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnPaintPriority({ record }) {
   const { t } = useTranslation();
@@ -31,27 +31,25 @@ export default function ProductionListColumnPaintPriority({ record }) {
 
   return (
     <Dropdown
-      menu={{
+      overlay={
-        onClick: handleSetPaintPriority,
+        <Menu onClick={handleSetPaintPriority}>
-        items: [
+          <Menu.Item key="clearPaintPriority">
-          {
+            {t("production.actions.paintpriority-clear")}
-            key: "clearPaintPriority",
+          </Menu.Item>
-            label: t("production.actions.paintpriority-clear"),
+          <Menu.SubMenu
-          },
+            key="set"
-          {
+            title={t("production.actions.paintpriority-set")}
-            key: "set",
+          >
-            label: t("production.actions.paintpriority-set"),
+            {new Array(15).fill().map((value, index) => (
-            children: new Array(15).fill().map((value, index) => ({
+              <Menu.Item key={index + 1}>
-              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
-      onOpenChange={handleVisibleChange}
+      onVisibleChange={handleVisibleChange}
-      open={visible}
+      visible={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, Spin } from "antd";
+import { Dropdown, Menu, Spin } from "antd";
 import React, { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -38,14 +38,16 @@ export function ProductionListColumnCategory({ record, bodyshop }) {
 
   return (
     <Dropdown
-      menu={{
+      overlay={
-        style: { maxHeight: "200px", overflowY: "auto" },
+        <Menu
-        onClick: handleSetStatus,
+          style={{ maxHeight: "200px", overflowY: "auto" }}
-        items: bodyshop.md_categories.map((item) => ({
+          onClick={handleSetStatus}
-          key: item,
+        >
-          label: item,
+          {bodyshop.md_categories.map((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, Spin } from "antd";
+import { Dropdown, Menu, 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 { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
@@ -47,14 +47,16 @@ export function ProductionListColumnStatus({
 
   return (
     <Dropdown
-      menu={{
+      overlay={
-        style: { maxHeight: "200px", overflowY: "auto" },
+        <Menu
-        onClick: handleSetStatus,
+          style={{ maxHeight: "200px", overflowY: "auto" }}
-        items: bodyshop.md_ro_statuses.production_statuses.map((item) => ({
+          onClick={handleSetStatus}
-          key: item,
+        >
-          label: item,
+          {bodyshop.md_ro_statuses.production_statuses.map((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,6 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { PageHeader } from '@ant-design/pro-layout';
+import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
-import { Descriptions, Drawer, Space, Button } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -91,7 +90,7 @@ export function ProductionListDetail({
       placement="right"
       width={"33%"}
       onClose={handleClose}
-      open={selected}
+      visible={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 open={visible} content={popMenu}>
+    <Popover visible={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 } from "antd";
+import { Button, Dropdown, Menu } 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,86 +31,98 @@ export function ProductionListPrint({ bodyshop }) {
   return (
     <Dropdown
       trigger="click"
-      menu={{
+      overlay={
-        items: [
+        <Menu>
-          ...Object.keys(ProdTemplates).map((key) => ({
+          {Object.keys(ProdTemplates).map((key) => (
-            key: key,
+            <Menu.Item
-            onClick: async () => {
+              key={key}
-              setLoading(true);
+              onClick={async () => {
-              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: production_by_technician_one.key,
+                    name: ProdTemplates[key].key,
-                    variables: { id: e.id },
+                    // variables: { id: contract.id },
                   },
                   {},
                   "p"
                 );
                 setLoading(false);
-              },
+              }}
-              label: `${e.first_name || ""} ${e.last_name || ""}`.trim(),
+            >
-            })),
+              {ProdTemplates[key].title}
-          },
+            </Menu.Item>
-          {
+          ))}
-            key: "prodbycategory",
+          <Menu.SubMenu
-            label: t("reportcenter.templates.production_by_category_one"),
+            title={t("reportcenter.templates.production_by_technician_one")}
-            children: bodyshop.md_categories.map((e) => ({
+          >
-              key: e,
+            {bodyshop.employees.map((e) => (
-              onClick: async () => {
+              <Menu.Item
-                setLoading(true);
+                key={e.id}
-                await GenerateDocument(
+                onClick={async () => {
-                  {
+                  setLoading(true);
-                    name: production_by_category_one.key,
+                  await GenerateDocument(
-                    variables: { category: e },
+                    {
-                  },
+                      name: production_by_technician_one.key,
-                  {},
+                      variables: { id: e.id },
-                  "p"
+                    },
-                );
+                    {},
-                setLoading(false);
+                    "p"
-              },
+                  );
-              label: e,
+                  setLoading(false);
-            })),
+                }}
-          },
+              >
-          {
+                {e.first_name} {e.last_name}
-            key: "prodbyrepairstatus",
+              </Menu.Item>
-            label: t("reportcenter.templates.production_by_repair_status_one"),
+            ))}
-            children: bodyshop.md_ro_statuses.production_statuses.map((e) => ({
+          </Menu.SubMenu>
-              key: e,
+          <Menu.SubMenu
-              onClick: async () => {
+            title={t("reportcenter.templates.production_by_category_one")}
-                setLoading(true);
+          >
-                await GenerateDocument(
+            {bodyshop.md_categories.map((e) => (
-                  {
+              <Menu.Item
-                    name: production_by_repair_status_one.key,
+                key={e}
-                    variables: { status: e },
+                onClick={async () => {
-                  },
+                  setLoading(true);
-                  {},
+                  await GenerateDocument(
-                  "p"
+                    {
-                );
+                      name: production_by_category_one.key,
-                setLoading(false);
+                      variables: { category: e },
-              },
+                    },
-              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,7 +1,15 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { PageHeader } from '@ant-design/pro-layout';
+import {
-import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
+  Button,
+  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";
@@ -113,10 +121,13 @@ export function ProductionListTable({
   const headerItem = (col) => (
     <Dropdown
       className="prod-header-dropdown"
-      menu={{
+      overlay={
-        onClick: removeColumn,
+        <Menu onClick={removeColumn}>
-        items: [{ key: col.key, label: t("production.actions.removecolumn") }],
+          <Menu.Item key={col.key}>
-      }}
+            {t("production.actions.removecolumn")}
+          </Menu.Item>
+        </Menu>
+      }
       trigger={["contextMenu"]}
     >
       <span>{col.title}</span>

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

@@ -2,13 +2,14 @@ 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");
@@ -41,7 +42,7 @@ export default function QboAuthorizeComponent() {
       history.push({ pathname: `/manage/accounting/receivables` });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [qs, location]);
+  }, [qs, location, setCookie]);
 
   return (
     <Space>

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

@@ -25,7 +25,7 @@ export function ReportCenterModalContainer({
 
   return (
     <Modal
-    open={visible}
+      visible={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, notification } from "antd";
+import { Dropdown, Menu, 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,12 +55,15 @@ export function ScheduleBlockDay({
     }
   };
 
+  const menu = (
+    <Menu onClick={handleMenu}>
+      <Menu.Item key="block">{t("appointments.actions.block")}</Menu.Item>
+    </Menu>
+  );
+
   return (
     <Dropdown
-      menu={{
+      overlay={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,6 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { PageHeader } from '@ant-design/pro-layout';
+import { Button, Card, Checkbox, Col, PageHeader, Row, Space } from "antd";
-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
-    open={visible}
+      visible={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} open={visibility}>
+    <Popover content={overlay} visible={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 open={visible} overlay={popContent}>
+      <Dropdown visible={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
-      open={state.visible}
+        visible={state.visible}
         destroyOnClose
         width="80%"
         cancelButtonProps={{ style: { display: "none" } }}