cheveguerra/whaticket-community
1
0
Fork 0
mirror of https://github.com/cheveguerra/whaticket-community.git synced 2026-04-18 11:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: started translation of backend errors

Browse Source
This commit is contained in:
canove
2020-10-13 06:50:00 -03:00
parent 09f8ef9be0
commit 011d8d5dfe
15 changed files with 100 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/src/components/MessageInput/index.js
View File

@@ -156,6 +156,7 @@ const MessageInput = ({ ticketStatus }) => {
const handleUploadMedia = async e => {
setLoading(true);
e.preventDefault();
const formData = new FormData();
formData.append("media", media.raw);
formData.append("fromMe", true);
@@ -164,11 +165,14 @@ const MessageInput = ({ ticketStatus }) => {
try {
await api.post(`/messages/${ticketId}`, formData);
} catch (err) {
console.log(err);
if (err.response && err.response.data && err.response.data.error) {
const errorMsg = err.response?.data?.error;
if (errorMsg === "ERR_SENDING_WAPP_MSG") {
toast.error(i18n.t("messagesInput.toasts.error"));
} else {
toast.error(err.response.data.error);
}
}
setLoading(false);
setMedia(mediaInitialState);
};
@@ -176,6 +180,7 @@ const MessageInput = ({ ticketStatus }) => {
const handleSendMessage = async () => {
if (inputMessage.trim() === "") return;
setLoading(true);
const message = {
read: 1,
fromMe: true,
@@ -185,11 +190,18 @@ const MessageInput = ({ ticketStatus }) => {
try {
await api.post(`/messages/${ticketId}`, message);
} catch (err) {
console.log(err);
if (err.response && err.response.data && err.response.data.error) {
toast.error(err.response.data.error);
const errorMsg = err.response?.data?.error;
if (errorMsg) {
if (i18n.exists(`backendErrors.${errorMsg}`)) {
toast.error(i18n.t(`backendErrors.${errorMsg}`));
} else {
toast.error(err.response.data.error);
}
} else {
toast.error("Unknown error");
}
}
setInputMessage("");
setShowEmoji(false);
setLoading(false);
@@ -225,15 +237,21 @@ const MessageInput = ({ ticketStatus }) => {
formData.append("fromMe", true);
await api.post(`/messages/${ticketId}`, formData);
setRecording(false);
setLoading(false);
} catch (err) {
console.log(err);
if (err.response && err.response.data && err.response.data.error) {
toast.error(err.response.data.error);
const errorMsg = err.response?.data?.error;
if (errorMsg) {
if (i18n.exists(`backendErrors.${errorMsg}`)) {
toast.error(i18n.t(`backendErrors.${errorMsg}`));
} else {
toast.error(err.response.data.error);
}
} else {
toast.error("Unknown error");
}
}
setRecording(false);
setLoading(false);
};
const handleCancelAudio = async () => {

12
frontend/src/components/MessageOptionsMenu/index.js
View File

@@ -16,9 +16,15 @@ const MessageOptionsMenu = ({ messageId, menuOpen, handleClose, anchorEl }) => {
try {
await api.delete(`/messages/${messageId}`);
} catch (err) {
console.log(err);
if (err.response && err.response.data && err.response.data.error) {
toast.error(err.response.data.error);
const errorMsg = err.response?.data?.error;
if (errorMsg) {
if (i18n.exists(`backendErrors.${errorMsg}`)) {
toast.error(i18n.t(`backendErrors.${errorMsg}`));
} else {
toast.error(err.response.data.error);
}
} else {
toast.error("Unknown error");
}
}
};

18
frontend/src/components/NewTicketModal/index.js
View File

@@ -25,12 +25,6 @@ const useStyles = makeStyles(theme => ({
display: "flex",
flexWrap: "wrap",
},
// btnWrapper: {
// // margin: theme.spacing(1),
// // position: "relative",
// display: "flex",
// },
}));
const filterOptions = createFilterOptions({
@@ -89,9 +83,15 @@ const NewTicketModal = ({ modalOpen, onClose }) => {
});
history.push(`/tickets/${ticket.id}`);
} catch (err) {
console.log(err);
if (err.response && err.response.data && err.response.data.error) {
toast.error(err.response.data.error);
const errorMsg = err.response?.data?.error;
if (errorMsg) {
if (i18n.exists(`backendErrors.${errorMsg}`)) {
toast.error(i18n.t(`backendErrors.${errorMsg}`));
} else {
toast.error(err.response.data.error);
}
} else {
toast.error("Unknown error");
}
}
setLoading(false);