ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлено отсутствие отправки запроса на слияние телеметрий

Browse Source
This commit is contained in:
goodmice 2022-04-12 10:22:31 +05:00
parent fcb264b122
commit d37ceeb68f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
View File

@ -59,14 +59,13 @@ export const TelemetryMerger = memo(() => {
const mergeTelemetry = useCallback(() => invokeWebApiWrapperAsync( const mergeTelemetry = useCallback(() => invokeWebApiWrapperAsync(
async () => { async () => {
await new Promise(res => setTimeout(res, 1000)) await AdminTelemetryService.mergeTelemetries(secondary.id, primary.id)
/// await AdminTelemetryService.mergeTelemetries(secondary.id, primary.id)
await updateTelemetry() await updateTelemetry()
}, },
setIsMerging, setIsMerging,
'Не удалось объединить телеметрии', 'Не удалось объединить телеметрии',
'Объединение телеметрий', 'Объединение телеметрий',
), [updateTelemetry]) ), [updateTelemetry, secondary.id, primary.id])
useEffect(() => updateTelemetry(), [updateTelemetry]) useEffect(() => updateTelemetry(), [updateTelemetry])
@ -76,7 +75,6 @@ export const TelemetryMerger = memo(() => {
const secondaryId = parseInt(query.get('secondary') ?? null) const secondaryId = parseInt(query.get('secondary') ?? null)
const primary = isNaN(primaryId) ? null : telemetry.find((t) => t.id === primaryId) const primary = isNaN(primaryId) ? null : telemetry.find((t) => t.id === primaryId)
const secondary = isNaN(secondaryId) ? null : telemetry.find((t) => t.id === secondaryId) const secondary = isNaN(secondaryId) ? null : telemetry.find((t) => t.id === secondaryId)
console.log([primary, secondary])
setPrimary(primary) setPrimary(primary)
setSecondary(secondary) setSecondary(secondary)
}, [location, telemetry]) }, [location, telemetry])