- Merge client update into test-beta

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

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

@@ -1,40 +1,38 @@
-import { PlusCircleOutlined } from "@ant-design/icons";
-import { Dropdown, Menu } from "antd";
+import {PlusCircleOutlined} from "@ant-design/icons";
+import {Dropdown} from "antd";
 import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setMessage } from "../../redux/messaging/messaging.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {setMessage} from "../../redux/messaging/messaging.actions";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop,
+    //currentUser: selectCurrentUser
+    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-  setMessage: (message) => dispatch(setMessage(message)),
+    //setUserLanguage: language => dispatch(setUserLanguage(language))
+    setMessage: (message) => dispatch(setMessage(message)),
 });
 
-export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
-  const menu = (
-    <Menu>
-      {bodyshop.md_messaging_presets.map((i, idx) => (
-        <Menu.Item onClick={() => setMessage(i.text)} key={idx}>
-          {i.label}
-        </Menu.Item>
-      ))}
-    </Menu>
-  );
+export function ChatPresetsComponent({bodyshop, setMessage, className}) {
 
-  return (
-    <div className={className}>
-      <Dropdown trigger={["click"]} overlay={menu}>
-        <PlusCircleOutlined />
-      </Dropdown>
-    </div>
-  );
+    const items = bodyshop.md_messaging_presets.map((i, idx) => ({
+        key: idx,
+        label: (i.label),
+        onClick: () => setMessage(i.text),
+    }));
+
+    return (
+        <div className={className}>
+            <Dropdown trigger={["click"]} menu={{items}}>
+                <PlusCircleOutlined/>
+            </Dropdown>
+        </div>
+    );
 }
+
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+    mapStateToProps,
+    mapDispatchToProps
 )(ChatPresetsComponent);