+
+
+
+
+
+
+ );
+};
+
+export default Ticket;
diff --git a/frontend/src/components/Ticket/Ticket.style.jsx b/frontend/src/components/Ticket/Ticket.style.jsx
new file mode 100644
index 0000000..c6e12c9
--- /dev/null
+++ b/frontend/src/components/Ticket/Ticket.style.jsx
@@ -0,0 +1,7 @@
+import styled from "styled-components";
+import { color } from "../../style/varibles";
+
+export const TicketStyled = styled.div`
+ width: 100%;
+ background-color: ${color.status.no};
+`;
diff --git a/frontend/src/components/Ticket/TicketSearch/TicketSearch.jsx b/frontend/src/components/Ticket/TicketSearch/TicketSearch.jsx
new file mode 100644
index 0000000..265672f
--- /dev/null
+++ b/frontend/src/components/Ticket/TicketSearch/TicketSearch.jsx
@@ -0,0 +1,10 @@
+import React from 'react'
+import TicketSearchInput from './TicketSearchInput/TicketSearchInput'
+
+const TicketSearch = ({spinning,setNewTicketModalOpen, handleSearch}) => {
+ return (
+
+
+
+
+ {tickets.contact.name}
+{tickets.lastMessage}
+ {tickets.unreadMessages ? ( +
+
-
+
-
- -
-
- {reportOption === '1' &&
-
-
+ -
+ {reportOption === "1" && (
+
},
+ { title: "Nome", field: "name", cellStyle: { whiteSpace: "nowrap" } },
+
+ {
+ title: "Status",
+ field: "statusOnline.status",
+
+ cellStyle: (e, rowData) => {
+ if (rowData["statusOnline"] && rowData["statusOnline"].status) {
+ if (rowData["statusOnline"].status === "offline") {
+ return { color: "red" };
+ } else if (rowData["statusOnline"].status === "online") {
+ return { color: "green" };
+ } else if (rowData["statusOnline"].status === "logout...") {
+ return { color: "orange" };
+ } else if (rowData["statusOnline"].status === "waiting...") {
+ return { color: "orange" };
+ }
+ }
+ },
},
- }}
-
- title="Usuários online/offline"
- columns={
- [
-
- // { title: 'Foto', field: 'ticket.contact.profilePicUrl', render: rowData => },
- { title: 'Nome', field: 'name', cellStyle: {whiteSpace: 'nowrap'}, },
-
- {
- title: 'Status', field: 'statusOnline.status',
-
- cellStyle: (e, rowData) => {
-
- if (rowData['statusOnline'] && rowData['statusOnline'].status) {
-
- if (rowData['statusOnline'].status === 'offline') {
-
- return { color: "red" };
- }
- else if (rowData['statusOnline'].status === 'online') {
- return { color: "green" };
- }
- else if (rowData['statusOnline'].status === 'logout...') {
- return { color: "orange" };
- }
- else if (rowData['statusOnline'].status === 'waiting...') {
- return { color: "orange" };
- }
- }
-
-
- },
-
- },
-
- { title: 'Tempo online', field: 'sumOnlineTime.sum' },
- { title: 'Data inicio', field: 'startDate' },
- { title: 'Data fim', field: 'endDate' },
- { title: 'Em atendimento', field: 'sumOpen.count' },
- { title: 'Finalizado', field: 'sumClosed.count' },
-
- ]
- }
+ { title: "Tempo online", field: "sumOnlineTime.sum" },
+ { title: "Data inicio", field: "startDate" },
+ { title: "Data fim", field: "endDate" },
+ { title: "Em atendimento", field: "sumOpen.count" },
+ { title: "Finalizado", field: "sumClosed.count" },
+ ]}
data={dataRows}
// icons={tableIcons}
actions={[
(rowData) => {
-
- if (rowData.statusOnline &&
- rowData.statusOnline['status'] &&
- rowData.statusOnline['status'] === 'online') {
-
-
+ if (
+ rowData.statusOnline &&
+ rowData.statusOnline["status"] &&
+ rowData.statusOnline["status"] === "online"
+ ) {
return {
icon: LogoutIcon,
- tooltip: 'deslogar',
+ tooltip: "deslogar",
disable: false,
onClick: (event, rowData) => {
-
- // console.log(' ROW DATA INFO: ', rowData, ' | rowData: ', rowData.id)
- handleLogouOnlineUser(rowData.id)
- }
- }
-
-
+ // console.log(' ROW DATA INFO: ', rowData, ' | rowData: ', rowData.id)
+ handleLogouOnlineUser(rowData.id);
+ },
+ };
}
- }
+ },
]}
+ options={{
+ search: true,
+ selection: false,
+ paging: false,
+ padding: "dense",
+ sorting: true,
+ //loadingType: 'linear',
+ searchFieldStyle: {
+ width: 300,
+ },
+ pageSize: 20,
+ headerStyle: {
+ position: "sticky",
+ top: "0",
+ },
+ maxBodyHeight: "400px",
- options={
- {
- search: true,
- selection: false,
- paging: false,
- padding: 'dense',
- sorting: true,
- //loadingType: 'linear',
- searchFieldStyle: {
- width: 300,
- },
+ rowStyle: {
+ fontSize: 14,
+ },
- pageSize: 20,
- headerStyle: {
- position: "sticky",
- top: "0"
- },
- maxBodyHeight: "400px",
+ // cellStyle: (rowData) => {
+ // return {
+ // fontSize: 12,
+ // color: "#fff",
- rowStyle: {
- fontSize: 14,
- }
-
-
- // cellStyle: (rowData) => {
- // return {
- // fontSize: 12,
- // color: "#fff",
-
- // };
- // }
-
-
-
-
-
-
-
- }}
+ // };
+ // }
+ }}
/>
-
- }
-
+ )}
-
-
)}
/>
- )
+ );
};
export default Report;
+
diff --git a/frontend/src/pages/Tickets/Tickets.jsx b/frontend/src/pages/Tickets/Tickets.jsx
new file mode 100644
index 0000000..78ef468
--- /dev/null
+++ b/frontend/src/pages/Tickets/Tickets.jsx
@@ -0,0 +1,20 @@
+import React from "react";
+import { useParams } from "react-router-dom";
+
+import TicketsStyled from "./Tickets.style";
+
+import TicketsManager from "../../components/Ticket/TicketsManager/TicketsManager";
+import Ticket from "../../components/Ticket/Ticket";
+
+const Tickets = () => {
+ const { ticketId } = useParams();
+ return (
+
+
+ );
+};
+
+export default Tickets;
+
diff --git a/frontend/src/pages/Tickets/Tickets.style.jsx b/frontend/src/pages/Tickets/Tickets.style.jsx
new file mode 100644
index 0000000..b690fc6
--- /dev/null
+++ b/frontend/src/pages/Tickets/Tickets.style.jsx
@@ -0,0 +1,10 @@
+import styled from "styled-components";
+
+const TicketsStyled = styled.div`
+ display: flex;
+ flex-direction: row;
+ min-height: auto;
+
+`;
+
+export default TicketsStyled
\ No newline at end of file
diff --git a/frontend/src/pages/Tickets/index.js b/frontend/src/pages/Tickets/index.js
index 461145a..1c68971 100644
--- a/frontend/src/pages/Tickets/index.js
+++ b/frontend/src/pages/Tickets/index.js
@@ -4,7 +4,7 @@ import Grid from "@material-ui/core/Grid";
import Paper from "@material-ui/core/Paper";
import { makeStyles } from "@material-ui/core/styles";
-import TicketsManager from "../../components/TicketsManager/";
+import TicketsManager from "../../components/Ticket/TicketsManager/index";
import Ticket from "../../components/Ticket/";
import { i18n } from "../../translate/i18n";
diff --git a/frontend/src/routes/Route.js b/frontend/src/routes/Route.js
index 788501e..8aa58b5 100644
--- a/frontend/src/routes/Route.js
+++ b/frontend/src/routes/Route.js
@@ -2,7 +2,7 @@ import React, { useContext } from "react";
import { Route as RouterRoute, Redirect } from "react-router-dom";
import { AuthContext } from "../context/Auth/AuthContext";
-import Loading from "../components/LoadingScreen/Loading"
+import LoadingScreen from "../components/LoadingScreen/LoadingScreen"
const Route = ({ component: Component, isPrivate = false, ...rest }) => {
const { isAuth, loading } = useContext(AuthContext);
@@ -10,7 +10,7 @@ const Route = ({ component: Component, isPrivate = false, ...rest }) => {
if (!isAuth && isPrivate) {
return (
<>
- {loading &&
+
diff --git a/frontend/src/components/TicketActionButtons/index.js b/frontend/src/components/TicketActionButtons/index.js
index 3919503..58feff5 100644
--- a/frontend/src/components/TicketActionButtons/index.js
+++ b/frontend/src/components/TicketActionButtons/index.js
@@ -12,167 +12,147 @@ import ButtonWithSpinner from "../ButtonWithSpinner";
import toastError from "../../errors/toastError";
import { AuthContext } from "../../context/Auth/AuthContext";
-import Modal from "../ChatEnd/ModalChatEnd";
-import { render } from '@testing-library/react';
+import Modal from "../ChatEnd/ModalChatEnd";
+import { render } from "@testing-library/react";
-const useStyles = makeStyles(theme => ({
- actionButtons: {
- marginRight: 6,
- flex: "none",
- alignSelf: "center",
- marginLeft: "auto",
- "& > *": {
- margin: theme.spacing(1),
- },
- },
+const useStyles = makeStyles((theme) => ({
+ actionButtons: {
+ marginRight: 6,
+ flex: "none",
+ alignSelf: "center",
+ marginLeft: "auto",
+ "& > *": {
+ margin: theme.spacing(1),
+ },
+ },
}));
const TicketActionButtons = ({ ticket, statusChatEnd }) => {
- const classes = useStyles();
- const history = useHistory();
- const [anchorEl, setAnchorEl] = useState(null);
- const [loading, setLoading] = useState(false);
- const ticketOptionsMenuOpen = Boolean(anchorEl);
- const { user } = useContext(AuthContext);
-
- const handleOpenTicketOptionsMenu = e => {
- setAnchorEl(e.currentTarget);
- };
+ const classes = useStyles();
+ const history = useHistory();
+ const [anchorEl, setAnchorEl] = useState(null);
+ const [loading, setLoading] = useState(false);
+ const ticketOptionsMenuOpen = Boolean(anchorEl);
+ const { user } = useContext(AuthContext);
- const handleCloseTicketOptionsMenu = e => {
- setAnchorEl(null);
- };
+ const handleOpenTicketOptionsMenu = (e) => {
+ setAnchorEl(e.currentTarget);
+ };
-
- const chatEndVal = (data) => {
-
- if(data){
+ const handleCloseTicketOptionsMenu = (e) => {
+ setAnchorEl(null);
+ };
- data = {...data, 'ticketId': ticket.id}
-
- console.log('ChatEnd: ',(data));
+ const chatEndVal = (data) => {
+ if (data) {
+ data = { ...data, ticketId: ticket.id };
- handleUpdateTicketStatus(null, "closed", user?.id, data)
+ console.log("ChatEnd: ", data);
- }
-
- }
+ handleUpdateTicketStatus(null, "closed", user?.id, data);
+ }
+ };
+ const handleModal = (/*status, userId*/) => {
+ render(
+
-
-
+ setUserData({ name: event.target.data })}
+ />
+ setUserData({ email: event.target.data })}
+ />
(theme.palette.mode === 'dark' ? '#101010' : '#fff'),
- color: (theme) => (theme.palette.mode === 'dark' ? 'grey.300' : 'grey.800'),
- border: '1px solid',
- borderColor: (theme) =>
- theme.palette.mode === 'dark' ? 'grey.800' : 'grey.300',
+ bgcolor: (theme) => (theme.palette.mode === "dark" ? "#101010" : "#fff"),
+ color: (theme) => (theme.palette.mode === "dark" ? "grey.300" : "grey.800"),
+ border: "1px solid",
+ borderColor: (theme) => (theme.palette.mode === "dark" ? "grey.800" : "grey.300"),
p: 1,
m: 1,
borderRadius: 2,
- fontSize: '0.875rem',
- fontWeight: '700',
+ fontSize: "0.875rem",
+ fontWeight: "700",
...sx,
}}
{...other}
@@ -280,76 +239,64 @@ function Item(props) {
Item.propTypes = {
sx: PropTypes.oneOfType([
- PropTypes.arrayOf(
- PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool]),
- ),
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])),
PropTypes.func,
PropTypes.object,
]),
};
-
-
let columnsData = [
- { title: 'Unidade', field: 'whatsapp.name' },
- { title: 'Atendente', field: 'user.name' },
- { title: 'Contato', field: 'contact.number' },
- { title: 'Nome', field: 'contact.name' },
- { title: 'Assunto', field: 'queue.name' },
+ { title: "Unidade", field: "whatsapp.name" },
+ { title: "Atendente", field: "user.name" },
+ { title: "Contato", field: "contact.number" },
+ { title: "Nome", field: "contact.name" },
+ { title: "Assunto", field: "queue.name" },
- { title: 'Status', field: 'status' },
-
- { title: 'Criado', field: 'createdAt' },
+ { title: "Status", field: "status" },
+
+ { title: "Criado", field: "createdAt" },
//{title: 'Atualizado', field: 'updatedAt'},
- {title: 'Status de encerramento', field: 'statusChatEnd'}];
-
+ { title: "Status de encerramento", field: "statusChatEnd" },
+];
const Report = () => {
-
- const csvLink = useRef()
+ const csvLink = useRef();
const { user: userA } = useContext(AuthContext);
- //--------
+ //--------
const [searchParam] = useState("");
//const [loading, setLoading] = useState(false);
- //const [hasMore, setHasMore] = useState(false);
+ //const [hasMore, setHasMore] = useState(false);
const [pageNumber, setPageNumber] = useState(1);
const [users, dispatch] = useReducer(reducer, []);
- //const [columns, setColums] = useState([])
- const [startDate, setDatePicker1] = useState(new Date())
- const [endDate, setDatePicker2] = useState(new Date())
- const [userId, setUser] = useState(null)
- const [query, dispatchQ] = useReducer(reducerQ, [])
+ //const [columns, setColums] = useState([])
+ const [startDate, setDatePicker1] = useState(new Date());
+ const [endDate, setDatePicker2] = useState(new Date());
+ const [userId, setUser] = useState(null);
+ const [query, dispatchQ] = useReducer(reducerQ, []);
- const [dataCSV, setDataCSV] = useState([])
+ const [dataCSV, setDataCSV] = useState([]);
const [isMount, setIsMount] = useState(true);
- const [reportOption, setReport] = useState('1')
- const [reporList,] = useState(report)
- const [profile, setProfile] = useState('')
+ const [reportOption, setReport] = useState("1");
+ const [reporList] = useState(report);
+ const [profile, setProfile] = useState("");
const [dataRows, setData] = useState([]);
-
-
-
useEffect(() => {
dispatch({ type: "RESET" });
- dispatchQ({ type: "RESET" })
+ dispatchQ({ type: "RESET" });
setPageNumber(1);
}, [searchParam, profile]);
-
-
useEffect(() => {
- //setLoading(true);
+ //setLoading(true);
const delayDebounceFn = setTimeout(() => {
-
const fetchUsers = async () => {
try {
-
//console.log('profile: ', profile)
const { data } = await api.get("/users/", {
@@ -358,111 +305,87 @@ const Report = () => {
dispatch({ type: "LOAD_USERS", payload: data.users });
//setHasMore(data.hasMore);
- //setLoading(false);
-
-
+ //setLoading(false);
} catch (err) {
console.log(err);
}
};
fetchUsers();
-
}, 500);
return () => clearTimeout(delayDebounceFn);
}, [searchParam, pageNumber, reportOption, profile]);
-
-
useEffect(() => {
-
//setLoading(true);
const delayDebounceFn = setTimeout(() => {
-
const fetchQueries = async () => {
try {
-
- if (reportOption === '1') {
-
- const dataQuery = await api.get("/reports/", { params: { userId, startDate, endDate }, });
- dispatchQ({ type: "RESET" })
+ if (reportOption === "1") {
+ const dataQuery = await api.get("/reports/", {
+ params: { userId, startDate, endDate },
+ });
+ dispatchQ({ type: "RESET" });
dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data });
//setLoading(false);
- // console.log('dataQuery: ', dataQuery.data)
+ // console.log('dataQuery: ', dataQuery.data)
- // console.log()
-
- }
- else if (reportOption === '2') {
-
- const dataQuery = await api.get("/reports/user/services", { params: { userId, startDate, endDate }, });
- dispatchQ({ type: "RESET" })
+ // console.log()
+ } else if (reportOption === "2") {
+ const dataQuery = await api.get("/reports/user/services", {
+ params: { userId, startDate, endDate },
+ });
+ dispatchQ({ type: "RESET" });
dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data });
//setLoading(false);
- // console.log('REPORT 2 dataQuery : ', dataQuery.data)
+ // console.log('REPORT 2 dataQuery : ', dataQuery.data)
//console.log()
-
}
-
} catch (err) {
console.log(err);
}
};
fetchQueries();
-
}, 500);
return () => clearTimeout(delayDebounceFn);
-
}, [userId, startDate, endDate, reportOption]);
-
// Get from child 1
const datePicker1Value = (data) => {
-
- setDatePicker1(data)
- }
+ setDatePicker1(data);
+ };
// Get from child 2
const datePicker2Value = (data) => {
-
- setDatePicker2(data)
- }
+ setDatePicker2(data);
+ };
// Get from child 3
const textFieldSelectUser = (data) => {
-
- setUser(data)
- }
-
-
-
+ setUser(data);
+ };
// Get from report option
const reportValue = (data) => {
+ setReport(data);
- setReport(data)
-
- // console.log(' data: ', data)
- }
+ // console.log(' data: ', data)
+ };
useEffect(() => {
-
- if (reportOption === '1') {
- setProfile('')
+ if (reportOption === "1") {
+ setProfile("");
+ } else if (reportOption === "2") {
+ setProfile("user");
}
- else if (reportOption === '2') {
- setProfile('user')
- }
-
- }, [reportOption])
-
+ }, [reportOption]);
// useEffect(() => {
@@ -470,108 +393,87 @@ const Report = () => {
// }, [query])
-
-
- // test del
+ // test del
const handleCSVMessages = () => {
-
- // setLoading(true);
+ // setLoading(true);
const fetchQueries = async () => {
-
try {
+ const dataQuery = await api.get("/reports/messages", {
+ params: { userId, startDate, endDate },
+ });
- const dataQuery = await api.get("/reports/messages", { params: { userId, startDate, endDate }, });
-
- // console.log('dataQuery messages: ', dataQuery.data)
+ // console.log('dataQuery messages: ', dataQuery.data)
if (dataQuery.data.length > 0) {
-
let dataCSVFormat = dataQuery.data;
for (var i = 0; i < dataCSVFormat.length; i++) {
if (dataCSVFormat[i].fromMe) {
- dataCSVFormat[i].fromMe = 'Atendente'
- }
- else {
- dataCSVFormat[i].fromMe = 'Cliente'
+ dataCSVFormat[i].fromMe = "Atendente";
+ } else {
+ dataCSVFormat[i].fromMe = "Cliente";
}
}
// console.log('dataCSVFormat: ', dataCSVFormat)
- setDataCSV(dataCSVFormat)
+ setDataCSV(dataCSVFormat);
setIsMount(false);
// setDataCSV(dataQuery.data)
}
- // setLoading(false);
-
+ // setLoading(false);
} catch (err) {
console.log(err);
}
};
fetchQueries();
-
- }
-
-
-
-
+ };
useEffect(() => {
-
if (isMount) {
return;
}
- csvLink.current.link.click()
-
+ csvLink.current.link.click();
}, [dataCSV, isMount, csvLink]);
-
-
-
useEffect(() => {
-
- if (reportOption === '2') {
-
+ if (reportOption === "2") {
const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
socket.on("onlineStatus", (data) => {
+ // setLoading(true);
- // setLoading(true);
+ let date = new Date().toLocaleDateString("pt-BR").split("/");
+ let dateToday = `${date[2]}-${date[1]}-${date[0]}`;
+ // console.log('date: ', new Date(startDate).toLocaleDateString('pt-BR'))
+ // console.log('date2: ', startDate)
- let date = new Date().toLocaleDateString('pt-BR').split('/')
- let dateToday = `${date[2]}-${date[1]}-${date[0]}`
-
- // console.log('date: ', new Date(startDate).toLocaleDateString('pt-BR'))
- // console.log('date2: ', startDate)
-
-
- if (data.action === "logout" || (data.action === "update" &&
- ((`${startDate}` === `${endDate}`) && (`${endDate}` === `${dateToday}`) && (`${startDate}` === `${dateToday}`)))) {
-
+ if (
+ data.action === "logout" ||
+ (data.action === "update" &&
+ `${startDate}` === `${endDate}` &&
+ `${endDate}` === `${dateToday}` &&
+ `${startDate}` === `${dateToday}`)
+ ) {
//console.log('UPDATE FROM ONLINE/OFFLINE LOGED USERS: ', data.userOnlineTime, ' | data.action : ', data.action)
dispatchQ({ type: "UPDATE_STATUS_ONLINE", payload: data.userOnlineTime });
-
- }
- else if (data.action === "delete") {
+ } else if (data.action === "delete") {
dispatchQ({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime });
}
// setLoading(false);
-
});
socket.on("user", (data) => {
-
if (data.action === "delete") {
- // console.log(' entrou no delete user: ', data)
+ // console.log(' entrou no delete user: ', data)
dispatch({ type: "DELETE_USER", payload: +data.userId });
}
});
@@ -579,13 +481,9 @@ const Report = () => {
return () => {
socket.disconnect();
};
-
}
-
-
}, [reportOption, startDate, endDate]);
-
// const handleDeleteRows = (id) => {
// let _data = [...dataRows];
@@ -593,46 +491,42 @@ const Report = () => {
// _data.forEach(rd => {
// _data = _data.filter(t => t.id !== id);
// });
- // setData(_data);
+ // setData(_data);
// };
-
useEffect(() => {
-
- //if (!loading) {
-
+ //if (!loading) {
// setData(query.map(({ scheduleReminder, ...others }) => (
// { ...others, 'scheduleReminder': `${others.statusChatEndId}` === '3' ? 'Agendamento' : 'Lembrete' }
// )))
// }
- setData(query.map((column) => { return { ...column } }))
-
- }, [query])
+ setData(
+ query.map((column) => {
+ return { ...column };
+ })
+ );
+ }, [query]);
const handleLogouOnlineUser = async (userId) => {
try {
await api.get(`/users/logout/${userId}`);
//toast.success(("Desloged!"));
- //handleDeleteRows(scheduleId)
+ //handleDeleteRows(scheduleId)
} catch (err) {
// toastError(err);
}
-
-
};
-
return (
-
(
-
+
{
@@ -642,13 +536,27 @@ const Report = () => {
-
+
-
+
+ -
+
+ -
-
- }
-
-
+ )}
-
-
-
-
-
-
+ {ticket.status === "closed" && (
+ {
+ handleModal();
+ // handleUpdateTicketStatus(e, "closed", user?.id)
+ }}
+ >
+ {i18n.t("messagesList.header.buttons.resolve")}
+
- }
- else{
-
- await api.put(`/tickets/${ticket.id}`, {
- status: status,
- userId: userId || null
- });
-
- }
-
- setLoading(false);
- if (status === "open") {
- history.push(`/tickets/${ticket.id}`);
- } else {
- history.push("/tickets");
- }
- } catch (err) {
- setLoading(false);
- toastError(err);
- }
-
-
-
-
- };
-
- return (
-
+
+ handleUpdateTicketStatus(e, "open", user?.id)}
+ >
+ {i18n.t("messagesList.header.buttons.accept")}
+
+ )}
+
+ );
};
export default TicketActionButtons;
+
diff --git a/frontend/src/components/TicketsQueueSelect/index.js b/frontend/src/components/TicketsQueueSelect/index.js
index 2d4d225..e3d1f09 100644
--- a/frontend/src/components/TicketsQueueSelect/index.js
+++ b/frontend/src/components/TicketsQueueSelect/index.js
@@ -6,55 +6,52 @@ import Select from "@material-ui/core/Select";
import { Checkbox, ListItemText } from "@material-ui/core";
import { i18n } from "../../translate/i18n";
-const TicketsQueueSelect = ({
- userQueues,
- selectedQueueIds = [],
- onChange,
-}) => {
- const handleChange = e => {
- onChange(e.target.value);
- };
+const TicketsQueueSelect = ({ userQueues, selectedQueueIds = [], onChange }) => {
+ const handleChange = (e) => {
+ onChange(e.target.value);
+ };
- return (
-
- {ticket.status === "closed" && (
- {
-
-
- handleModal()
- // handleUpdateTicketStatus(e, "closed", user?.id)
-
- }}
- >
- {i18n.t("messagesList.header.buttons.resolve")}
-
-
-
-
- handleUpdateTicketStatus(e, "open", user?.id)}
- >
- {i18n.t("messagesList.header.buttons.accept")}
-
- )}
-
- );
+
-
-
-
-
- );
+ return (
+
+
+
+
+
+ );
};
export default TicketsQueueSelect;
+
diff --git a/frontend/src/components/UserModal/UserModal.jsx b/frontend/src/components/UserModal/UserModal.jsx
index 3f9776c..f3cd056 100644
--- a/frontend/src/components/UserModal/UserModal.jsx
+++ b/frontend/src/components/UserModal/UserModal.jsx
@@ -6,30 +6,62 @@ import api from "../../services/api";
import { AuthContext } from "../../context/Auth/AuthContext";
import { Can } from "../Can";
-import BtnComponent from "../Base/BTN/Btn";
+import BtnComponent from "../Base/Btn/Btn";
import FormComponent from "../Base/Form/FormComponent";
import InputComponent from "../Base/Form/Input/InputComponent";
import UserModalComponent from "./UserModalImg/UserModalComponent";
import UserImg from "../../assets/images/User/user.jpg";
-const UserModal = ({ modal, click }) => {
+const UserModal = ({ modal, click, userId }) => {
const { user } = React.useContext(AuthContext);
- const initalData = {
- name: user.name,
- email: user.email,
- perfil:user.profile,
- }
- console.log(user);
+ const InitalState = {
+ name: "",
+ email: "",
+ password: "",
+ profile: "",
+ };
+ const [userData, setUserData] = React.useState(InitalState);
+ const [selectedQueueIds, setSelectedQueueIds] = React.useState([]);
+
+ React.useEffect(() => {
+ // const fetchUser = async () => {
+ // if (!userId) return;
+ // try {
+ // const { data } = await api.get(`/users/${userId}`);
+ // setUserData((prevState) => {
+ // return console.log({ ...prevState, ...data });
+ // });
+ // const userQueueIds = data.queues?.map((queue) => queue.id);
+ // setSelectedQueueIds(userQueueIds);
+ // } catch (err) {
+ // alert(err);
+ // }
+ // };
+
+ // fetchUser();
+ }, [userId]);
return (
{/*
Não tem nada
}
+