admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added manual conversation creation BOD-379

Browse Source
This commit is contained in:
Patrick Fic
2020-09-03 08:57:13 -07:00
parent 51b6a560a6
commit f3b32fae76
10 changed files with 123 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bodyshop_translations.babel
View File

@@ -18197,6 +18197,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>new</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
@@ -18244,6 +18265,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>phonenumber</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>presets</name>
<definition_loaded>false</definition_loaded>

49
client/src/components/chat-new-conversation/chat-new-conversation.component.jsx Normal file
View File

@@ -0,0 +1,49 @@
import { PlusCircleFilled } from "@ant-design/icons";
import { Button, Form, Popover } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { openChatByPhone } from "../../redux/messaging/messaging.actions";
import PhoneFormItem from "../form-items-formatted/phone-form-item.component";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
});
export function ChatNewConversation({ openChatByPhone }) {
const { t } = useTranslation();
const [form] = Form.useForm();
const handleFinish = (values) => {
console.log("values :>> ", values);
openChatByPhone({ phone_num: values.phoneNumber });
form.resetFields();
};
const popContent = (
<div>
<Form form={form} onFinish={handleFinish}>
<Form.Item label={t("messaging.labels.phonenumber")} name="phoneNumber">
<PhoneFormItem />
</Form.Item>
<Button type="primary" htmlType="submit">
{t("messaging.actions.new")}
</Button>
</Form>
</div>
);
return (
<Popover trigger="click" content={popContent}>
<PlusCircleFilled style={{ margin: "1rem" }} />
</Popover>
);
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(ChatNewConversation);

10
client/src/components/chat-popup/chat-popup.component.jsx
View File

@@ -9,6 +9,7 @@ import ChatConversationListComponent from "../chat-conversation-list/chat-conver
import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
import "./chat-popup.styles.scss";
import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
const mapStateToProps = createStructuredSelector({
selectedConversation: selectSelectedConversation,
@@ -25,9 +26,12 @@ export function ChatPopupComponent({
const { t } = useTranslation();
return (
<div className="chat-popup">
<Typography.Title level={4}>
{t("messaging.labels.messaging")}
</Typography.Title>
<div style={{ display: "flex", alignItems: "center" }}>
<Typography.Title level={4}>
{t("messaging.labels.messaging")}
</Typography.Title>
<ChatNewConversation />
</div>
<ShrinkOutlined
onClick={() => toggleChatVisible()}
style={{ position: "absolute", right: ".5rem", top: ".5rem" }}

2
client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
View File

@@ -20,7 +20,7 @@ export default function ChatTagRoContainer({ conversation }) {
loadRo(v);
};
const debouncedExecuteSearch = _.debounce(executeSearch, 800);
const debouncedExecuteSearch = _.debounce(executeSearch, 500);
const handleSearch = (value) => {
debouncedExecuteSearch({ variables: { search: value } });

2
client/src/components/job-search-select/job-search-select.component.jsx
View File

@@ -23,7 +23,7 @@ const JobSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
const executeSearch = (v) => {
callSearch(v);
};
const debouncedExecuteSearch = _.debounce(executeSearch, 800);
const debouncedExecuteSearch = _.debounce(executeSearch, 500);
const handleSearch = (value) => {
debouncedExecuteSearch({ variables: { search: value } });

3
client/src/components/jobs-change-status/jobs-change-status.component.jsx
View File

@@ -44,6 +44,9 @@ export function JobsChangeStatus({ job, bodyshop }) {
)
setAvailableStatuses(bodyshop.md_ro_statuses.post_production_statuses);
else {
console.log(
"Status didn't match any restrictions. Allowing all status changes."
);
setAvailableStatuses(bodyshop.statuses);
}
}

18
client/src/redux/messaging/messaging.sagas.js
View File

@@ -32,6 +32,7 @@ export function* onOpenChatByPhone() {
export function* openChatByPhone({ payload }) {
logImEXEvent("messaging_open_by_phone");
const { phone_num, jobid } = payload;
const bodyshop = yield select(selectBodyshop);
try {
const {
@@ -39,7 +40,9 @@ export function* openChatByPhone({ payload }) {
} = yield client.query({
query: CONVERSATION_ID_BY_PHONE,
variables: { phone: phone(phone_num)[0] },
fetchPolicy: "network-only",
});
if (conversations.length === 0) {
const {
data: {
@@ -61,13 +64,14 @@ export function* openChatByPhone({ payload }) {
} else if (conversations.length === 1) {
//got the ID. Open it.
yield put(setSelectedConversation(conversations[0].id));
yield client.mutate({
mutation: INSERT_CONVERSATION_TAG,
variables: {
conversationId: conversations[0].id,
jobId: jobid,
},
});
if (jobid)
yield client.mutate({
mutation: INSERT_CONVERSATION_TAG,
variables: {
conversationId: conversations[0].id,
jobId: jobid,
},
});
} else {
console.log("ERROR: Multiple conversations found. "); //TODO Graceful handling of this situation
}

4
client/src/translations/en_us/common.json
View File

@@ -1106,11 +1106,13 @@
},
"messaging": {
"actions": {
"link": "Link to Job"
"link": "Link to Job",
"new": "New Conversation"
},
"labels": {
"messaging": "Messaging",
"nojobs": "Not associated to any job.",
"phonenumber": "Phone #",
"presets": "Presets",
"typeamessage": "Send a message..."
}

4
client/src/translations/es/common.json
View File

@@ -1106,11 +1106,13 @@
},
"messaging": {
"actions": {
"link": ""
"link": "",
"new": ""
},
"labels": {
"messaging": "Mensajería",
"nojobs": "",
"phonenumber": "",
"presets": "",
"typeamessage": "Enviar un mensaje..."
}

4
client/src/translations/fr/common.json
View File

@@ -1106,11 +1106,13 @@
},
"messaging": {
"actions": {
"link": ""
"link": "",
"new": ""
},
"labels": {
"messaging": "Messagerie",
"nojobs": "",
"phonenumber": "",
"presets": "",
"typeamessage": "Envoyer un message..."
}