adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve duplicated quick responses bug and remove queue selection field on position page

feat-scaling-ticket-remote-creation
adriano 2024-04-15 11:04:14 -03:00
parent c9750222c0
commit 42073cc821
3 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/helpers/QuickAnswearByqueueFiltered.ts
View File

@ -5,10 +5,11 @@ export default function quickAnswearByQueueFiltered(
quickAnswers: QuickAnswer[] quickAnswers: QuickAnswer[]
) { ) {
let auxQuickAnswear = []; let auxQuickAnswear = [];
let repet: any[] = [];
const userQueues = queueIds.map((uq: any) => uq.queueId); const userQueues = queueIds.map((uq: any) => uq.queueId);
for (const quickAnswer of quickAnswers) { for (const quickAnswer of quickAnswers) {
const { queues } = quickAnswer; const { queues, id } = quickAnswer;
if (queues.length == 0) { if (queues.length == 0) {
auxQuickAnswear.push(quickAnswer); auxQuickAnswear.push(quickAnswer);
@ -17,7 +18,10 @@ export default function quickAnswearByQueueFiltered(
for (const q of queues) { for (const q of queues) {
if (userQueues.includes(q.id)) { if (userQueues.includes(q.id)) {
auxQuickAnswear.push(quickAnswer); if (repet.includes(id)) continue;
repet.push(id);
auxQuickAnswear.push(quickAnswer);
} }
} }
} }

21
frontend/src/components/PositionModal/index.js
View File

@ -70,11 +70,10 @@ const PositionModal = ({
} }
const [position, setPosition] = useState(initialState) const [position, setPosition] = useState(initialState)
const [selectedQueueIds, setSelectedQueueIds] = useState([]) // const [selectedQueueIds, setSelectedQueueIds] = useState([])
const { user, setting, getSettingValue } = useContext(AuthContext) const { setting } = useContext(AuthContext)
const [settings, setSettings] = useState(setting) const [settings, setSettings] = useState(setting)
// console.log('USER: ', JSON.stringify(user, null, 6))
useEffect(() => { useEffect(() => {
return () => { return () => {
@ -121,11 +120,11 @@ const PositionModal = ({
if (isMounted.current) { if (isMounted.current) {
setPosition(data) setPosition(data)
if (data?.queues) { // if (data?.queues) {
console.log('data.queues: ', data.queues) // console.log('data.queues: ', data.queues)
const quickQueueIds = data.queues?.map((queue) => queue.id) // const quickQueueIds = data.queues?.map((queue) => queue.id)
setSelectedQueueIds(quickQueueIds) // setSelectedQueueIds(quickQueueIds)
} // }
} }
} catch (err) { } catch (err) {
toastError(err) toastError(err)
@ -203,7 +202,7 @@ const PositionModal = ({
fullWidth fullWidth
/> />
</div> </div>
<div> {/* <div>
{ {
((settings && getSettingValue('quickAnswerByQueue') === 'enabled')) && ( ((settings && getSettingValue('quickAnswerByQueue') === 'enabled')) && (
<QueueSelect <QueueSelect
@ -215,7 +214,7 @@ const PositionModal = ({
/> />
) )
} }
</div> </div> */}
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button <Button

26
frontend/src/components/QuickAnswersModal/index.js
View File

@ -79,9 +79,7 @@ const QuickAnswersModal = ({
const [quickAnswer, setQuickAnswer] = useState(initialState) const [quickAnswer, setQuickAnswer] = useState(initialState)
const [selectedQueueIds, setSelectedQueueIds] = useState([]) const [selectedQueueIds, setSelectedQueueIds] = useState([])
const { user, setting, getSettingValue } = useContext(AuthContext) const { user, setting, getSettingValue } = useContext(AuthContext)
const [settings, setSettings] = useState(setting) const [settings, setSettings] = useState(setting)
// console.log('USER: ', JSON.stringify(user, null, 6))
useEffect(() => { useEffect(() => {
return () => { return () => {
@ -93,6 +91,14 @@ const QuickAnswersModal = ({
setSettings(setting) setSettings(setting)
}, [setting]) }, [setting])
useEffect(() => {
setSelectedQueueIds([])
if (open && selectedQueueIds.length === 0 && !quickAnswerId) {
setSelectedQueueIds(user.queues.map(q => q.id))
}
}, [open,])
useEffect(() => { useEffect(() => {
const socket = openSocket(process.env.REACT_APP_BACKEND_URL) const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
@ -113,7 +119,10 @@ const QuickAnswersModal = ({
} }
}, []) }, [])
useEffect(() => { useEffect(() => {
// setSelectedQueueIds([])
const fetchQuickAnswer = async () => { const fetchQuickAnswer = async () => {
if (initialValues) { if (initialValues) {
setQuickAnswer((prevState) => { setQuickAnswer((prevState) => {
@ -121,15 +130,16 @@ const QuickAnswersModal = ({
}) })
} }
if (!quickAnswerId) return if (!quickAnswerId) {
return
}
try { try {
const { data } = await api.get(`/quickAnswers/${quickAnswerId}`) const { data } = await api.get(`/quickAnswers/${quickAnswerId}`)
if (isMounted.current) { if (isMounted.current) {
setQuickAnswer(data) setQuickAnswer(data)
if (data?.queues) { if (data?.queues) {
console.log('data.queues: ', data.queues)
const quickQueueIds = data.queues?.map((queue) => queue.id) const quickQueueIds = data.queues?.map((queue) => queue.id)
setSelectedQueueIds(quickQueueIds) setSelectedQueueIds(quickQueueIds)
} }
@ -230,7 +240,7 @@ const QuickAnswersModal = ({
((settings && getSettingValue('quickAnswerByQueue') === 'enabled')) && ( ((settings && getSettingValue('quickAnswerByQueue') === 'enabled')) && (
<QueueSelect <QueueSelect
selectedQueueIds={selectedQueueIds} selectedQueueIds={selectedQueueIds}
onChange={(selectedIds) => { onChange={(selectedIds) => {
return setSelectedQueueIds(selectedIds) return setSelectedQueueIds(selectedIds)
}} }}
_queues={user.queues} _queues={user.queues}