- Merge client update into test-beta

Signed-off-by: Dave Richer <dave@imexsystems.ca>

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

@@ -1,46 +1,44 @@
-import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import {DownOutlined} from "@ant-design/icons";
+import {Dropdown} from "antd";
 import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+    bodyshop: selectBodyshop,
 });
 
-export function JobsDetailChangeFilehandler({ disabled, form, bodyshop }) {
-  const handleClick = ({ item, key, keyPath }) => {
-    const est = item.props.value;
-    form.setFieldsValue(est);
-  };
+export function JobsDetailChangeFilehandler({disabled, form, bodyshop}) {
+    const handleClick = ({item, key, keyPath}) => {
+        const est = item.props.value;
+        form.setFieldsValue(est);
+    };
 
-  const menu = (
-    <Menu
-      onClick={handleClick}
-      style={{
-        columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
-      }}
-    >
-      {bodyshop.md_filehandlers.map((est, idx) => (
-        <Menu.Item value={est} key={idx} style={{ breakInside: "avoid" }}>
-          {`${est.ins_ct_fn} ${est.ins_ct_ln}`}
-        </Menu.Item>
-      ))}
-    </Menu>
-  );
+    const menu = {
+        items: bodyshop.md_filehandlers.map((est, idx) => ({
+            key: idx,
+            label: `${est.ins_ct_fn} ${est.ins_ct_ln}`,
+            value: est,
+            style: {breakInside: "avoid"},
+        })),
+        style: {
+            columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
+        },
+        onClick: handleClick
+    }
 
-  return (
-    <Dropdown overlay={menu} disabled={disabled}>
-      <a
-        className="ant-dropdown-link"
-        href=" #"
-        onClick={(e) => e.preventDefault()}
-      >
-        <DownOutlined />
-      </a>
-    </Dropdown>
-  );
+    return (
+        <Dropdown menu={menu} disabled={disabled}>
+            <a
+                className="ant-dropdown-link"
+                href=" #"
+                onClick={(e) => e.preventDefault()}
+            >
+                <DownOutlined/>
+            </a>
+        </Dropdown>
+    );
 }
 
 export default connect(mapStateToProps, null)(JobsDetailChangeFilehandler);