diff --git a/backend/src/helpers/QuickAnswearByqueueFiltered.ts b/backend/src/helpers/QuickAnswearByqueueFiltered.ts index 493f741..5ac0961 100644 --- a/backend/src/helpers/QuickAnswearByqueueFiltered.ts +++ b/backend/src/helpers/QuickAnswearByqueueFiltered.ts @@ -5,10 +5,11 @@ export default function quickAnswearByQueueFiltered( quickAnswers: QuickAnswer[] ) { let auxQuickAnswear = []; + let repet: any[] = []; const userQueues = queueIds.map((uq: any) => uq.queueId); for (const quickAnswer of quickAnswers) { - const { queues } = quickAnswer; + const { queues, id } = quickAnswer; if (queues.length == 0) { auxQuickAnswear.push(quickAnswer); @@ -17,7 +18,10 @@ export default function quickAnswearByQueueFiltered( for (const q of queues) { if (userQueues.includes(q.id)) { - auxQuickAnswear.push(quickAnswer); + if (repet.includes(id)) continue; + repet.push(id); + + auxQuickAnswear.push(quickAnswer); } } } diff --git a/frontend/src/components/PositionModal/index.js b/frontend/src/components/PositionModal/index.js index 516f4ac..29dcde5 100644 --- a/frontend/src/components/PositionModal/index.js +++ b/frontend/src/components/PositionModal/index.js @@ -70,11 +70,10 @@ const PositionModal = ({ } const [position, setPosition] = useState(initialState) - const [selectedQueueIds, setSelectedQueueIds] = useState([]) - const { user, setting, getSettingValue } = useContext(AuthContext) + // const [selectedQueueIds, setSelectedQueueIds] = useState([]) + const { setting } = useContext(AuthContext) const [settings, setSettings] = useState(setting) - - // console.log('USER: ', JSON.stringify(user, null, 6)) + useEffect(() => { return () => { @@ -121,11 +120,11 @@ const PositionModal = ({ if (isMounted.current) { setPosition(data) - if (data?.queues) { - console.log('data.queues: ', data.queues) - const quickQueueIds = data.queues?.map((queue) => queue.id) - setSelectedQueueIds(quickQueueIds) - } + // if (data?.queues) { + // console.log('data.queues: ', data.queues) + // const quickQueueIds = data.queues?.map((queue) => queue.id) + // setSelectedQueueIds(quickQueueIds) + // } } } catch (err) { toastError(err) @@ -203,7 +202,7 @@ const PositionModal = ({ fullWidth /> -
+ {/*
{ ((settings && getSettingValue('quickAnswerByQueue') === 'enabled')) && ( ) } -
+
*/}