Compare commits
3 Commits
4d3cab5333
...
eb1d0f2303
| Author | SHA1 | Date |
|---|---|---|
willian-pessoa
|
eb1d0f2303 | |
|
willian-pessoa
|
dac57f9d48 | |
|
willian-pessoa
|
5981f9dd5e |
|
|
@ -452,14 +452,14 @@ const MessagesList = ({ ticketId, isGroup }) => {
|
|||
|
||||
onAppMessageMessagesList = (data) => {
|
||||
|
||||
if (data.action === "create") {
|
||||
if (data.action === "create" && data.ticket.id === ticketId) {
|
||||
|
||||
dispatch({ type: "ADD_MESSAGE", payload: data.message })
|
||||
|
||||
scrollToBottom()
|
||||
}
|
||||
|
||||
if (data.action === "update") {
|
||||
if (data.action === "update" && data.ticket.id === ticketId) {
|
||||
dispatch({ type: "UPDATE_MESSAGE", payload: data.message })
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ import React, { useState, useEffect, useRef, useContext } from "react"
|
|||
import * as Yup from "yup"
|
||||
import { Formik, Form, Field } from "formik"
|
||||
import { toast } from "react-toastify"
|
||||
import openSocket from 'socket.io-client'
|
||||
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import {
|
||||
makeStyles,
|
||||
|
|
@ -51,8 +51,8 @@ const useStyles = makeStyles((theme) => ({
|
|||
}))
|
||||
|
||||
const PositionSchema = Yup.object().shape({
|
||||
name: Yup.string()
|
||||
.required("Required"),
|
||||
name: Yup.string()
|
||||
.required("Required"),
|
||||
})
|
||||
|
||||
const PositionModal = ({
|
||||
|
|
@ -66,14 +66,14 @@ const PositionModal = ({
|
|||
const isMounted = useRef(true)
|
||||
|
||||
const initialState = {
|
||||
name: "",
|
||||
name: "",
|
||||
}
|
||||
|
||||
const [position, setPosition] = useState(initialState)
|
||||
// const [selectedQueueIds, setSelectedQueueIds] = useState([])
|
||||
const { setting } = useContext(AuthContext)
|
||||
const [settings, setSettings] = useState(setting)
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
|
|
@ -87,9 +87,9 @@ const PositionModal = ({
|
|||
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsPosition = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -98,10 +98,12 @@ const PositionModal = ({
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsPosition)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsPosition)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
@ -141,7 +143,7 @@ const PositionModal = ({
|
|||
|
||||
const handleSavePosition = async (values) => {
|
||||
try {
|
||||
|
||||
|
||||
if (positionId) {
|
||||
await api.put(`/positions/${positionId}`, values)
|
||||
handleClose()
|
||||
|
|
@ -154,7 +156,7 @@ const PositionModal = ({
|
|||
handleClose()
|
||||
toast.success("Cargo salvo com sucesso")
|
||||
}
|
||||
|
||||
|
||||
} catch (err) {
|
||||
toastError(err)
|
||||
}
|
||||
|
|
@ -201,7 +203,7 @@ const PositionModal = ({
|
|||
className={classes.textField}
|
||||
fullWidth
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{/* <div>
|
||||
{
|
||||
((settings && getSettingValue('quickAnswerByQueue') === 'enabled')) && (
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
import React, { useEffect, useState, useContext } from "react";
|
||||
import QRCode from "qrcode.react";
|
||||
import openSocket from "socket.io-client";
|
||||
//import openSocket from "socket.io-client";
|
||||
import { socket } from "../../services/socket";
|
||||
|
||||
import toastError from "../../errors/toastError";
|
||||
|
||||
import { Dialog, DialogContent, Paper, Typography } from "@material-ui/core";
|
||||
|
|
@ -31,9 +33,9 @@ const QrcodeModal = ({ open, onClose, whatsAppId }) => {
|
|||
|
||||
useEffect(() => {
|
||||
if (!whatsAppId) return;
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
|
||||
|
||||
socket.on("whatsappSession", data => {
|
||||
const onWhatsAppSessionQrCode = data => {
|
||||
if (data.action === "update" && data.session.id === whatsAppId) {
|
||||
setQrCode(data.session.qrcode);
|
||||
}
|
||||
|
|
@ -42,21 +44,23 @@ const QrcodeModal = ({ open, onClose, whatsAppId }) => {
|
|||
onClose();
|
||||
}
|
||||
|
||||
if (data.action === "error") {
|
||||
if (data.action === "error") {
|
||||
|
||||
console.log('user.profile: ', user.profile)
|
||||
console.log('user.profile: ', user.profile)
|
||||
|
||||
if(user.profile === 'master'){
|
||||
if (user.profile === 'master') {
|
||||
|
||||
alert(data.msg)
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
socket.on("whatsappSession", onWhatsAppSessionQrCode);
|
||||
|
||||
return () => {
|
||||
socket.disconnect();
|
||||
socket.off("whatsappSession", onWhatsAppSessionQrCode);
|
||||
};
|
||||
}, [whatsAppId, onClose, user.profile]);
|
||||
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ import { IconButton, InputAdornment } from "@material-ui/core"
|
|||
import { Colorize } from "@material-ui/icons"
|
||||
|
||||
import { AuthContext } from '../../context/Auth/AuthContext'
|
||||
import openSocket from 'socket.io-client'
|
||||
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
|
||||
const useStyles = makeStyles(theme => ({
|
||||
|
|
@ -92,9 +92,9 @@ const QueueModal = ({ open, onClose, queueId }) => {
|
|||
}, [setting])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsQueueModal = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -103,10 +103,12 @@ const QueueModal = ({ open, onClose, queueId }) => {
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsQueueModal)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsQueueModal)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ import React, { useState, useEffect, useRef, useContext } from "react"
|
|||
import * as Yup from "yup"
|
||||
import { Formik, Form, Field } from "formik"
|
||||
import { toast } from "react-toastify"
|
||||
import openSocket from 'socket.io-client'
|
||||
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import {
|
||||
makeStyles,
|
||||
|
|
@ -79,7 +79,7 @@ const QuickAnswersModal = ({
|
|||
const [quickAnswer, setQuickAnswer] = useState(initialState)
|
||||
const [selectedQueueIds, setSelectedQueueIds] = useState([])
|
||||
const { user, setting, getSettingValue } = useContext(AuthContext)
|
||||
const [settings, setSettings] = useState(setting)
|
||||
const [settings, setSettings] = useState(setting)
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
|
|
@ -92,18 +92,18 @@ const QuickAnswersModal = ({
|
|||
}, [setting])
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
|
||||
setSelectedQueueIds([])
|
||||
if (open && selectedQueueIds.length === 0 && !quickAnswerId) {
|
||||
if (open && selectedQueueIds.length === 0 && !quickAnswerId) {
|
||||
setSelectedQueueIds(user.queues.map(q => q.id))
|
||||
}
|
||||
|
||||
}, [open,])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsQuickAnswersModal = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -112,14 +112,16 @@ const QuickAnswersModal = ({
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsQuickAnswersModal)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsQuickAnswersModal)
|
||||
}
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
useEffect(() => {
|
||||
|
||||
// setSelectedQueueIds([])
|
||||
|
||||
|
|
@ -139,7 +141,7 @@ const QuickAnswersModal = ({
|
|||
if (isMounted.current) {
|
||||
setQuickAnswer(data)
|
||||
|
||||
if (data?.queues) {
|
||||
if (data?.queues) {
|
||||
const quickQueueIds = data.queues?.map((queue) => queue.id)
|
||||
setSelectedQueueIds(quickQueueIds)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ import React, { useState, useEffect, useRef, useContext } from "react"
|
|||
import * as Yup from "yup"
|
||||
import { Formik, Form, Field } from "formik"
|
||||
import { toast } from "react-toastify"
|
||||
import openSocket from 'socket.io-client'
|
||||
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import {
|
||||
makeStyles,
|
||||
|
|
@ -91,9 +91,9 @@ const StatusChatEndModal = ({
|
|||
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsStatusChatEndModal = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -102,10 +102,12 @@ const StatusChatEndModal = ({
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsStatusChatEndModal)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsStatusChatEndModal)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import React, { useState, useContext, useMemo, useEffect } from "react"
|
||||
import { useHistory } from "react-router-dom"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import Button from "@material-ui/core/Button"
|
||||
import Dialog from "@material-ui/core/Dialog"
|
||||
|
|
@ -110,9 +111,9 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
|
|||
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsTransferTicketModal = (data) => {
|
||||
console.log('settings updated ----------------------------xxxxxxxxxxxx')
|
||||
|
||||
if (data.action === 'update') {
|
||||
|
|
@ -123,10 +124,12 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsTransferTicketModal)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsTransferTicketModal)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
@ -194,7 +197,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
|
|||
const { data } = await api.get(`/users/all`, {
|
||||
params: { userId: user.id },
|
||||
})
|
||||
|
||||
|
||||
setUsers(data.users)
|
||||
setQueuesByWhats(data.queues)
|
||||
setQueues(data.queues)
|
||||
|
|
@ -228,7 +231,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
|
|||
{i18n.t("transferTicketModal.title")}
|
||||
</DialogTitle>
|
||||
<DialogContent dividers >
|
||||
<FormControl variant="outlined" className={classes.maxWidth} style={{marginBottom: '8px'}}>
|
||||
<FormControl variant="outlined" className={classes.maxWidth} style={{ marginBottom: '8px' }}>
|
||||
{/* <InputLabel>{i18n.t("transferTicketModal.fieldQueueLabel")}</InputLabel> */}
|
||||
|
||||
<InputLabel>{'Usuário'}</InputLabel>
|
||||
|
|
@ -247,7 +250,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
|
|||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
</FormControl>
|
||||
</FormControl>
|
||||
|
||||
<FormControl variant="outlined" className={classes.maxWidth}>
|
||||
<InputLabel>{i18n.t("transferTicketModal.fieldQueuePlaceholder")}</InputLabel>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
import React, { useState, useCallback, useEffect, useReducer, useContext } from 'react'
|
||||
import { toast } from 'react-toastify'
|
||||
import { toast } from 'react-toastify'
|
||||
|
||||
import openSocket from 'socket.io-client'
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from '../../services/socket'
|
||||
|
||||
import { makeStyles } from '@material-ui/core/styles'
|
||||
import { green } from '@material-ui/core/colors'
|
||||
|
|
@ -13,11 +14,11 @@ import {
|
|||
IconButton,
|
||||
Table,
|
||||
TableHead,
|
||||
Paper,
|
||||
Paper,
|
||||
} from '@material-ui/core'
|
||||
import {
|
||||
Edit,
|
||||
DeleteOutline,
|
||||
Edit,
|
||||
DeleteOutline,
|
||||
// Restore
|
||||
} from '@material-ui/icons'
|
||||
|
||||
|
|
@ -26,7 +27,7 @@ import MainHeader from '../../components/MainHeader'
|
|||
import MainHeaderButtonsWrapper from '../../components/MainHeaderButtonsWrapper'
|
||||
import Title from '../../components/Title'
|
||||
import TableRowSkeleton from '../../components/TableRowSkeleton'
|
||||
|
||||
|
||||
import CampaignModal from '../../components/CampaignModal'
|
||||
import ConfirmationModal from '../../components/ConfirmationModal'
|
||||
import QrcodeModal from '../../components/QrcodeModal'
|
||||
|
|
@ -51,7 +52,7 @@ const reducer = (state, action) => {
|
|||
const campaigns = action.payload
|
||||
return [...state, ...campaigns]
|
||||
}
|
||||
if (action.type === "UPDATE_CAMPAIGNS") {
|
||||
if (action.type === "UPDATE_CAMPAIGNS") {
|
||||
|
||||
const campaign = action.payload
|
||||
const campaignIndex = state.findIndex((c) => c.id === campaign.id)
|
||||
|
|
@ -109,7 +110,7 @@ const useStyles = makeStyles((theme) => ({
|
|||
buttonProgress: {
|
||||
color: green[500],
|
||||
},
|
||||
}))
|
||||
}))
|
||||
|
||||
const Campaign = () => {
|
||||
//--------
|
||||
|
|
@ -124,7 +125,7 @@ const Campaign = () => {
|
|||
const [qrModalOpen, setQrModalOpen] = useState(false)
|
||||
const [selectedCampaign, setSelectedCampaign] = useState(null)
|
||||
const [confirmModalOpen, setConfirmModalOpen] = useState(false)
|
||||
|
||||
|
||||
const [campaigns, dispatch] = useReducer(reducer, [])
|
||||
|
||||
const [loading, setLoading] = useState(true)
|
||||
|
|
@ -152,7 +153,7 @@ const Campaign = () => {
|
|||
const delayDebounceFn = setTimeout(() => {
|
||||
const fetchContacts = async () => {
|
||||
|
||||
try {
|
||||
try {
|
||||
|
||||
const { data } = await apiBroker.get('/campaign', {
|
||||
params: {
|
||||
|
|
@ -160,7 +161,7 @@ const Campaign = () => {
|
|||
baseURL: process.env.REACT_APP_BACKEND_URL_PRIVATE,
|
||||
identifier: 'campaign'
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
dispatch({ type: "LOAD_CAMPAIGNS", payload: data.campaign })
|
||||
setLoading(false)
|
||||
|
|
@ -174,7 +175,7 @@ const Campaign = () => {
|
|||
}, 500)
|
||||
return () => clearTimeout(delayDebounceFn)
|
||||
}, [user.id])
|
||||
|
||||
|
||||
|
||||
const handleOpenCampaignModal = () => {
|
||||
setSelectedCampaign(null)
|
||||
|
|
@ -184,12 +185,12 @@ const Campaign = () => {
|
|||
const handleCloseCampaignModal = useCallback(() => {
|
||||
setCampaignModalOpen(false)
|
||||
setSelectedCampaign(null)
|
||||
}, [setSelectedCampaign, setCampaignModalOpen])
|
||||
}, [setSelectedCampaign, setCampaignModalOpen])
|
||||
|
||||
const handleStart = async (campaign) => {
|
||||
const handleStart = async (campaign) => {
|
||||
|
||||
try {
|
||||
const { data } = await apiBroker.post(`/campaign/start/${campaign.id}`)
|
||||
const { data } = await apiBroker.post(`/campaign/start/${campaign.id}`)
|
||||
|
||||
dispatch({ type: "UPDATE_CAMPAIGNS", payload: data.campaign })
|
||||
|
||||
|
|
@ -200,10 +201,10 @@ const Campaign = () => {
|
|||
}
|
||||
}
|
||||
|
||||
const handleStop = async (campaign) => {
|
||||
const handleStop = async (campaign) => {
|
||||
|
||||
try {
|
||||
const { data } = await apiBroker.post(`/campaign/stop/${campaign.id}`)
|
||||
const { data } = await apiBroker.post(`/campaign/stop/${campaign.id}`)
|
||||
|
||||
dispatch({ type: "UPDATE_CAMPAIGNS", payload: data.campaign })
|
||||
|
||||
|
|
@ -245,7 +246,7 @@ const Campaign = () => {
|
|||
setConfirmModalOpen(true)
|
||||
}
|
||||
|
||||
const handleSubmitConfirmationModal = async () => {
|
||||
const handleSubmitConfirmationModal = async () => {
|
||||
|
||||
if (confirmModalInfo.action === 'delete') {
|
||||
try {
|
||||
|
|
@ -293,13 +294,12 @@ const Campaign = () => {
|
|||
)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
|
||||
socket.on("contactsBulkInsertOnQueueStatus", (data) => {
|
||||
const onContactsBulkCampaing = (data) => {
|
||||
if (data.action === 'update') {
|
||||
|
||||
if (String(data.insertOnQueue.adminId) === String(user.id)) {
|
||||
|
|
@ -312,19 +312,24 @@ const Campaign = () => {
|
|||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('campaign', (data) => {
|
||||
socket.on("contactsBulkInsertOnQueueStatus", onContactsBulkCampaing)
|
||||
|
||||
const onCampaignCampaign = (data) => {
|
||||
|
||||
if (data.action === 'update') {
|
||||
dispatch({ type: "UPDATE_CAMPAIGNS", payload: data.campaign })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('campaign', onCampaignCampaign)
|
||||
|
||||
|
||||
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("campaign", onCampaignCampaign)
|
||||
socket.off("contactsBulkInsertOnQueueStatus", onContactsBulkCampaing)
|
||||
}
|
||||
}, [user.id])
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@ import React, { useState, useCallback, useEffect, useContext } from 'react'
|
|||
import { toast } from 'react-toastify'
|
||||
import { format, parseISO } from 'date-fns'
|
||||
|
||||
import openSocket from 'socket.io-client'
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from '../../services/socket'
|
||||
|
||||
import { makeStyles } from '@material-ui/core/styles'
|
||||
import { green, red, yellow, grey } from '@material-ui/core/colors'
|
||||
|
|
@ -144,7 +145,7 @@ const Connections = () => {
|
|||
const [selectedWhatsApp, setSelectedWhatsApp] = useState(null)
|
||||
const [confirmModalOpen, setConfirmModalOpen] = useState(false)
|
||||
|
||||
const [diskSpaceInfo, setDiskSpaceInfo] = useState({})
|
||||
const [diskSpaceInfo, setDiskSpaceInfo] = useState({})
|
||||
|
||||
const [settings, setSettings] = useState([])
|
||||
|
||||
|
|
@ -388,7 +389,7 @@ const Connections = () => {
|
|||
getSettingValue('whatsaAppCloudApi') === 'disabled') && (
|
||||
<CustomToolTip title={'Whatsapp Cloud API está desativado'}>
|
||||
<FiberManualRecord style={{ color: grey[500] }} />
|
||||
</CustomToolTip>
|
||||
</CustomToolTip>
|
||||
)}
|
||||
{whatsApp.status === 'OPENING' && !whatsApp.isOfficial && (
|
||||
<CircularProgress size={24} className={classes.buttonProgress} />
|
||||
|
|
@ -433,7 +434,7 @@ const Connections = () => {
|
|||
try {
|
||||
await api.post(`/restartwhatsappsession/0`, {
|
||||
params: { status: 'status' },
|
||||
})
|
||||
})
|
||||
|
||||
setClicks((buttons) =>
|
||||
buttons.map((e) => {
|
||||
|
|
@ -451,15 +452,17 @@ const Connections = () => {
|
|||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('diskSpaceMonit', (data) => {
|
||||
const onDiskSpaceMonitConnections = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setDiskSpaceInfo(data.diskSpace)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
socket.on('diskSpaceMonit', onDiskSpaceMonitConnections)
|
||||
|
||||
const onSettingsConnections = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -468,10 +471,13 @@ const Connections = () => {
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsConnections)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsConnections)
|
||||
socket.off("diskSpaceMonit", onDiskSpaceMonitConnections)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import React, { useState, useEffect, useReducer, useCallback, useContext } from "react"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
import { toast } from "react-toastify"
|
||||
import { useHistory } from "react-router-dom"
|
||||
|
||||
|
|
@ -260,9 +261,9 @@ const Contacts = () => {
|
|||
}, [searchParam, pageNumber])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("contactsBulkInsertOnQueueStatus", (data) => {
|
||||
const onContactsBulkContacts = (data) => {
|
||||
if (data.action === 'update') {
|
||||
|
||||
if (String(data.insertOnQueue.adminId) === String(user.id)) {
|
||||
|
|
@ -278,9 +279,11 @@ const Contacts = () => {
|
|||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("contact", (data) => {
|
||||
socket.on("contactsBulkInsertOnQueueStatus", onContactsBulkContacts)
|
||||
|
||||
const onContactContacts = (data) => {
|
||||
if (data.action === "update" || data.action === "create") {
|
||||
dispatch({ type: "UPDATE_CONTACTS", payload: data.contact })
|
||||
}
|
||||
|
|
@ -288,10 +291,13 @@ const Contacts = () => {
|
|||
if (data.action === "delete") {
|
||||
dispatch({ type: "DELETE_CONTACT", payload: +data.contactId })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("contact", onContactContacts)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("contact", onContactContacts)
|
||||
socket.off("contactsBulkInsertOnQueueStatus", onContactsBulkContacts)
|
||||
}
|
||||
}, [user, history])
|
||||
|
||||
|
|
@ -536,7 +542,7 @@ const Contacts = () => {
|
|||
open={contactModalOpen}
|
||||
onClose={handleCloseContactModal}
|
||||
aria-labelledby="form-dialog-title"
|
||||
contactId={selectedContactId}
|
||||
contactId={selectedContactId}
|
||||
></ContactModal>
|
||||
<ContactCreateTicketModal
|
||||
modalOpen={isCreateTicketModalOpen}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ import { AuthContext } from "../../context/Auth/AuthContext"
|
|||
// import { i18n } from "../../translate/i18n";
|
||||
import Chart from "./Chart"
|
||||
import PieChart from "./PieChart"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
import api from "../../services/api"
|
||||
|
||||
import { Can } from "../../components/Can"
|
||||
|
|
@ -291,7 +292,7 @@ const Dashboard = () => {
|
|||
|
||||
const { data } = await api.get("/reports/user/services", {
|
||||
params: { userId: null, startDate: dateToday, endDate: dateToday, userQueues: selectedQueue },
|
||||
})
|
||||
})
|
||||
|
||||
dispatch({ type: "RESET" })
|
||||
dispatch({ type: "LOAD_QUERY", payload: data.usersProfile })
|
||||
|
|
@ -301,7 +302,7 @@ const Dashboard = () => {
|
|||
})
|
||||
|
||||
setTicketStatusChatEnd(ticketStatusChatEndData.reportStatusChatEnd)
|
||||
|
||||
|
||||
} catch (err) {
|
||||
|
||||
}
|
||||
|
|
@ -356,46 +357,54 @@ const Dashboard = () => {
|
|||
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("ticketStatus", (data) => {
|
||||
const onTicketsStatusDashboard = (data) => {
|
||||
if (data.action === "update") {
|
||||
setStatus("")
|
||||
setStatus(data.ticketStatus.status)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("onlineStatus", (data) => {
|
||||
socket.on("ticketStatus", onTicketsStatusDashboard)
|
||||
|
||||
const onOnlineStatusDashboard = (data) => {
|
||||
if (data.action === "logout" || data.action === "update") {
|
||||
|
||||
dispatch({ type: "UPDATE_STATUS_ONLINE", payload: data.userOnlineTime })
|
||||
} else if (data.action === "delete") {
|
||||
dispatch({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("user", (data) => {
|
||||
socket.on("onlineStatus", onOnlineStatusDashboard)
|
||||
|
||||
const onUserDashboard = (data) => {
|
||||
if (data.action === "delete") {
|
||||
dispatch({ type: "DELETE_USER", payload: +data.userId })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("user", onUserDashboard)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("user", onUserDashboard)
|
||||
socket.off("onlineStatus", onOnlineStatusDashboard)
|
||||
socket.off("ticketStatus", onTicketsStatusDashboard)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
||||
const handleSelectedQueue = useCallback((queueSelected) => {
|
||||
if(queueSelected !== 'All'){
|
||||
if (queueSelected !== 'All') {
|
||||
const queueIndex = user?.queues?.findIndex((q) => q.id === parseInt(queueSelected));
|
||||
const queueIds = []
|
||||
queueIds.push(user?.queues[queueIndex]?.id);
|
||||
setSelectedQueue(queueIds);
|
||||
}else{
|
||||
} else {
|
||||
const queueIds = user?.queues?.map((queue) => queue.id);
|
||||
setSelectedQueue(queueIds);
|
||||
}
|
||||
},[user, setSelectedQueue])
|
||||
}, [user, setSelectedQueue])
|
||||
|
||||
useEffect(() => {
|
||||
if (ticketStatusChange === "") return
|
||||
|
|
@ -468,14 +477,14 @@ const Dashboard = () => {
|
|||
</Typography>
|
||||
</Grid>
|
||||
<Grid style={{ display: 'flex', flexDirection: 'column', padding: '10px 0', alignItems: 'start' }}>
|
||||
<SelectField
|
||||
func={handleSelectedQueue}
|
||||
textBoxFieldSelected={'All'}
|
||||
emptyField={false}
|
||||
header={'Filas'}
|
||||
currencies={user.queues.map((obj) => {
|
||||
return { 'value': obj.id, 'label': obj.name }
|
||||
})} />
|
||||
<SelectField
|
||||
func={handleSelectedQueue}
|
||||
textBoxFieldSelected={'All'}
|
||||
emptyField={false}
|
||||
header={'Filas'}
|
||||
currencies={user.queues.map((obj) => {
|
||||
return { 'value': obj.id, 'label': obj.name }
|
||||
})} />
|
||||
</Grid>
|
||||
<Grid container spacing={3}>
|
||||
<Grid item xs={12} sm={6} md={6} lg={4}>
|
||||
|
|
@ -532,7 +541,7 @@ const Dashboard = () => {
|
|||
<Grid item container spacing={3}>
|
||||
<Grid item xs={12} sm={12} md={6} lg={6}>
|
||||
<Paper className={classes.fixedHeightPaper} variant="outlined">
|
||||
<Chart allTickets={usersOnlineInfo} selectedQueue = {selectedQueue}/>
|
||||
<Chart allTickets={usersOnlineInfo} selectedQueue={selectedQueue} />
|
||||
</Paper>
|
||||
</Grid>
|
||||
<Grid item xs={12} sm={12} md={6} lg={6}>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import React, { useState, useContext, useEffect, useReducer } from "react"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import {
|
||||
Button,
|
||||
|
|
@ -125,9 +126,9 @@ const Position = () => {
|
|||
}, [searchParam, pageNumber])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("position", (data) => {
|
||||
const onPositionPosition = (data) => {
|
||||
if (data.action === "update" || data.action === "create") {
|
||||
dispatch({ type: "UPDATE_POSITIONS", payload: data.position })
|
||||
}
|
||||
|
|
@ -138,10 +139,12 @@ const Position = () => {
|
|||
payload: +data.positionId,
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("position", onPositionPosition)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("position", onPositionPosition)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import React, { useEffect, useReducer, useState, useContext } from 'react'
|
||||
|
||||
import openSocket from 'socket.io-client'
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from '../../services/socket'
|
||||
|
||||
import {
|
||||
Button,
|
||||
|
|
@ -91,7 +92,7 @@ const reducer = (state, action) => {
|
|||
const Queues = () => {
|
||||
const classes = useStyles()
|
||||
|
||||
const { user, setting, getSettingValue } = useContext(AuthContext)
|
||||
const { user, setting, getSettingValue } = useContext(AuthContext)
|
||||
|
||||
const [queues, dispatch] = useReducer(reducer, [])
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
|
@ -120,12 +121,12 @@ const Queues = () => {
|
|||
setLoading(false)
|
||||
}
|
||||
})()
|
||||
}, [])
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('queue', (data) => {
|
||||
const onQueueQueues = (data) => {
|
||||
if (data.action === 'update' || data.action === 'create') {
|
||||
dispatch({ type: 'UPDATE_QUEUES', payload: data.queue })
|
||||
}
|
||||
|
|
@ -133,9 +134,11 @@ const Queues = () => {
|
|||
if (data.action === 'delete') {
|
||||
dispatch({ type: 'DELETE_QUEUE', payload: data.queueId })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
socket.on('queue', onQueueQueues)
|
||||
|
||||
const onSettingsQueues = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -144,10 +147,13 @@ const Queues = () => {
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsQueues)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsQueues)
|
||||
socket.off("queue", onQueueQueues)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import React, { useState, useContext, useEffect, useReducer } from "react"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import {
|
||||
Button,
|
||||
|
|
@ -125,9 +126,9 @@ const QuickAnswers = () => {
|
|||
}, [searchParam, pageNumber])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("quickAnswer", (data) => {
|
||||
const onQuickAnswerQuickAnswers = (data) => {
|
||||
if (data.action === "update" || data.action === "create") {
|
||||
dispatch({ type: "UPDATE_QUICK_ANSWERS", payload: data.quickAnswer })
|
||||
}
|
||||
|
|
@ -138,10 +139,11 @@ const QuickAnswers = () => {
|
|||
payload: +data.quickAnswerId,
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
socket.on("quickAnswer", onQuickAnswerQuickAnswers)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("quickAnswer", onQuickAnswerQuickAnswers)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ import MaterialTable from 'material-table'
|
|||
import LogoutIcon from '@material-ui/icons/CancelOutlined'
|
||||
import apiBroker from "../../services/apiBroker"
|
||||
import fileDownload from 'js-file-download'
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
import { i18n } from "../../translate/i18n"
|
||||
import Switch from '@mui/material/Switch'
|
||||
|
||||
|
|
@ -239,7 +240,7 @@ let columnsData = [
|
|||
{ title: `Espera`, field: 'waiting_time' },
|
||||
{ title: `Mensagens`, field: 'messagesToFilter', searchable: true, hidden: true },
|
||||
{ title: `Link`, field: 'link', searchable: false, hidden: true, export: true },
|
||||
]
|
||||
]
|
||||
|
||||
let columnsDataSuper = [
|
||||
{ title: `Tipo`, field: 'isRemote' },
|
||||
|
|
@ -381,10 +382,10 @@ const Report = () => {
|
|||
const tickets = data.tickets.map(ticket => {
|
||||
ticket.isRemote = ticket.isRemote ? 'Remoto' : 'Comum';
|
||||
return ({
|
||||
...ticket,
|
||||
messagesToFilter: ticket.messages.map(message => message.body).join(' '),
|
||||
link: `${process.env.REACT_APP_FRONTEND_URL}/tickets/${ticket.id}`
|
||||
})
|
||||
...ticket,
|
||||
messagesToFilter: ticket.messages.map(message => message.body).join(' '),
|
||||
link: `${process.env.REACT_APP_FRONTEND_URL}/tickets/${ticket.id}`
|
||||
})
|
||||
})
|
||||
dispatchQ({ type: "LOAD_QUERY", payload: tickets })
|
||||
setHasMore(data.hasMore)
|
||||
|
|
@ -591,9 +592,9 @@ const Report = () => {
|
|||
|
||||
useEffect(() => {
|
||||
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("queryOnQueueStatus", (data) => {
|
||||
const onQueryOnQueueStatusReport = (data) => {
|
||||
if (data.action === 'update') {
|
||||
|
||||
if (String(data.queryOnQueue.adminId) === String(userA.id)) {
|
||||
|
|
@ -604,35 +605,39 @@ const Report = () => {
|
|||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("queryOnQueueStatus", onQueryOnQueueStatusReport)
|
||||
|
||||
const onOnlineStatusReport = (data) => {
|
||||
|
||||
let date = new Date().toLocaleDateString('pt-BR').split('/')
|
||||
let dateToday = `${date[2]}-${date[1]}-${date[0]}`
|
||||
|
||||
if (data.action === "logout" || (data.action === "update" &&
|
||||
((`${startDate}` === `${endDate}`) && (`${endDate}` === `${dateToday}`) && (`${startDate}` === `${dateToday}`)))) {
|
||||
|
||||
dispatchQ({ type: "UPDATE_STATUS_ONLINE", payload: data.userOnlineTime })
|
||||
|
||||
}
|
||||
else if (data.action === "delete") {
|
||||
dispatchQ({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime })
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const onUserReport = (data) => {
|
||||
|
||||
if (data.action === "delete") {
|
||||
dispatch({ type: "DELETE_USER", payload: +data.userId })
|
||||
}
|
||||
}
|
||||
|
||||
if (reportOption === '2') {
|
||||
|
||||
socket.on("onlineStatus", onOnlineStatusReport)
|
||||
|
||||
socket.on("onlineStatus", (data) => {
|
||||
|
||||
let date = new Date().toLocaleDateString('pt-BR').split('/')
|
||||
let dateToday = `${date[2]}-${date[1]}-${date[0]}`
|
||||
|
||||
if (data.action === "logout" || (data.action === "update" &&
|
||||
((`${startDate}` === `${endDate}`) && (`${endDate}` === `${dateToday}`) && (`${startDate}` === `${dateToday}`)))) {
|
||||
|
||||
dispatchQ({ type: "UPDATE_STATUS_ONLINE", payload: data.userOnlineTime })
|
||||
|
||||
}
|
||||
else if (data.action === "delete") {
|
||||
dispatchQ({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime })
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
socket.on("user", (data) => {
|
||||
|
||||
if (data.action === "delete") {
|
||||
dispatch({ type: "DELETE_USER", payload: +data.userId })
|
||||
}
|
||||
})
|
||||
|
||||
socket.on("user", onUserReport)
|
||||
|
||||
}
|
||||
else if (reportOption === "1") {
|
||||
|
|
@ -641,7 +646,9 @@ const Report = () => {
|
|||
}
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("onlineStatus", onOnlineStatusReport)
|
||||
socket.off("user", onUserReport)
|
||||
socket.off("queryOnQueueStatus", onQueryOnQueueStatusReport)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -687,7 +694,7 @@ const Report = () => {
|
|||
|
||||
|
||||
const renderSwitch = (param) => {
|
||||
if(userA.profile !== 'supervisor'){
|
||||
if (userA.profile !== 'supervisor') {
|
||||
switch (param) {
|
||||
case 'empty':
|
||||
return (
|
||||
|
|
@ -880,7 +887,7 @@ const Report = () => {
|
|||
<>
|
||||
<MTable data={query}
|
||||
columns={userA.profile !== 'supervisor' ? columnsData : columnsDataSuper}
|
||||
hasChild={userA.profile !== 'supervisor' ? true :false}
|
||||
hasChild={userA.profile !== 'supervisor' ? true : false}
|
||||
removeClickRow={false}
|
||||
|
||||
handleScroll={handleScroll}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ import { render } from '@testing-library/react'
|
|||
// import Modal from "../../../..ChatEnd/ModalChatEnd";
|
||||
import Modal from "../../components/ModalUpdateScheduleReminder"
|
||||
|
||||
import openSocket from "socket.io-client"
|
||||
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
|
||||
|
||||
|
|
@ -204,11 +204,9 @@ const SchedulesReminder = () => {
|
|||
|
||||
useEffect(() => {
|
||||
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("schedulingNotify", (data) => {
|
||||
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
const onSchedulingNotifySchedulesRemider = (data) => {
|
||||
|
||||
setLoading(true)
|
||||
|
||||
|
|
@ -228,10 +226,12 @@ const SchedulesReminder = () => {
|
|||
setLoading(false)
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("schedulingNotify", onSchedulingNotifySchedulesRemider)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("schedulingNotify", onSchedulingNotifySchedulesRemider)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
@ -300,9 +300,9 @@ const SchedulesReminder = () => {
|
|||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
useEffect(() => {
|
||||
|
||||
if (!loading) {
|
||||
if (!loading) {
|
||||
|
||||
setData(query.map(({ scheduleReminder, ...others }) => (
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import React, { useState, useEffect, useContext } from 'react'
|
||||
import openSocket from 'socket.io-client'
|
||||
//import openSocket from 'socket.io-client'
|
||||
import { socket } from '../../services/socket.js'
|
||||
|
||||
import { makeStyles } from '@material-ui/core/styles'
|
||||
import Paper from '@material-ui/core/Paper'
|
||||
|
|
@ -124,9 +125,9 @@ const Settings = () => {
|
|||
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsSettings = (data) => {
|
||||
console.log('settings updated ----------------------------')
|
||||
|
||||
if (data.action === 'update') {
|
||||
|
|
@ -137,10 +138,12 @@ const Settings = () => {
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on('settings', onSettingsSettings)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsSettings)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
@ -641,7 +644,7 @@ const Settings = () => {
|
|||
</Select>
|
||||
</Paper>
|
||||
</Container>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import React, { useState, useContext, useEffect, useReducer } from "react"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import {
|
||||
Button,
|
||||
|
|
@ -115,7 +116,7 @@ const StatusChatEnd = () => {
|
|||
const { data } = await api.get("/statusChatEnd", {
|
||||
params: { searchParam, pageNumber },
|
||||
})
|
||||
|
||||
|
||||
setChecked(data?.statusChatEnd?.map(s => s.isDefault ? true : false))
|
||||
|
||||
dispatch({ type: "LOAD_STATUS_CHAT_END", payload: data.statusChatEnd })
|
||||
|
|
@ -131,9 +132,9 @@ const StatusChatEnd = () => {
|
|||
}, [searchParam, pageNumber])
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("statusChatEnd", (data) => {
|
||||
const onStatusChatEndStatusChatEnd = (data) => {
|
||||
if (data.action === "update" || data.action === "create") {
|
||||
dispatch({ type: "UPDATE_STATUS_CHAT_END", payload: data.statusChatEnd })
|
||||
}
|
||||
|
|
@ -144,10 +145,12 @@ const StatusChatEnd = () => {
|
|||
payload: +data.statusChatEndId,
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("statusChatEnd", onStatusChatEndStatusChatEnd)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("statusChatEnd", onStatusChatEndStatusChatEnd)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
@ -187,14 +190,14 @@ const StatusChatEnd = () => {
|
|||
}
|
||||
|
||||
const handleChange = async (event, statusChatEnd, index) => {
|
||||
|
||||
|
||||
const newChecked = new Array(statusChatEnds.length).fill(false)
|
||||
newChecked[index] = event.target.checked
|
||||
setChecked(newChecked)
|
||||
|
||||
try {
|
||||
const { id } = statusChatEnd
|
||||
await api.put(`/statusChatEnd/${id}`, { isDefault: event.target.checked })
|
||||
await api.put(`/statusChatEnd/${id}`, { isDefault: event.target.checked })
|
||||
toast.success("Status de encerramento padrão salvo com sucesso")
|
||||
|
||||
} catch (error) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import React, { useState, useEffect, useReducer, useContext } from "react"
|
||||
import { toast } from "react-toastify"
|
||||
import openSocket from "socket.io-client"
|
||||
//import openSocket from "socket.io-client"
|
||||
import { socket } from "../../services/socket"
|
||||
|
||||
import { makeStyles } from "@material-ui/core/styles"
|
||||
import Paper from "@material-ui/core/Paper"
|
||||
|
|
@ -165,9 +166,9 @@ const Users = () => {
|
|||
|
||||
|
||||
useEffect(() => {
|
||||
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
|
||||
|
||||
socket.on("user", (data) => {
|
||||
const onUserUsers = (data) => {
|
||||
if (data.action === "update" || data.action === "create") {
|
||||
dispatch({ type: "UPDATE_USERS", payload: data.user })
|
||||
}
|
||||
|
|
@ -175,10 +176,11 @@ const Users = () => {
|
|||
if (data.action === "delete") {
|
||||
dispatch({ type: "DELETE_USER", payload: +data.userId })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
socket.on("user", onUserUsers)
|
||||
|
||||
socket.on('settings', (data) => {
|
||||
const onSettingsUsers = (data) => {
|
||||
if (data.action === 'update') {
|
||||
setSettings((prevState) => {
|
||||
const aux = [...prevState]
|
||||
|
|
@ -187,10 +189,12 @@ const Users = () => {
|
|||
return aux
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
socket.on('settings', onSettingsUsers)
|
||||
|
||||
return () => {
|
||||
socket.disconnect()
|
||||
socket.off("settings", onSettingsUsers)
|
||||
socket.off("user", onUserUsers)
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue