From 09d41c177bec5e151ae50dcf49c8cd827f0f83d5 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Tue, 30 May 2023 15:51:59 +0200 Subject: [PATCH] fix(ui): fix network dupes filtering (#1292) Co-authored-by: nick-delirium --- .../shared/DevTools/NetworkPanel/NetworkPanel.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/frontend/app/components/shared/DevTools/NetworkPanel/NetworkPanel.tsx b/frontend/app/components/shared/DevTools/NetworkPanel/NetworkPanel.tsx index 9f7e9470a..08693c483 100644 --- a/frontend/app/components/shared/DevTools/NetworkPanel/NetworkPanel.tsx +++ b/frontend/app/components/shared/DevTools/NetworkPanel/NetworkPanel.tsx @@ -16,6 +16,7 @@ import BottomBlock from '../BottomBlock'; import InfoLine from '../BottomBlock/InfoLine'; import useAutoscroll, { getLastItemTime } from '../useAutoscroll'; import { useRegExListFilterMemo, useTabListFilterMemo } from '../useListFilter' +import { toJS } from 'mobx'; const INDEX_KEY = 'network'; @@ -172,9 +173,17 @@ function NetworkPanel({ startedAt }: { startedAt: number }) { // TODO: better merge (with body size info) - do it in player resourceList.filter(res => !fetchList.some(ft => { // res.url !== ft.url doesn't work on relative URLs appearing within fetchList (to-fix in player) + if (res.name === ft.name) { + if (res.start === ft.start) return true; + if (res.url.includes(ft.url)) { + return Math.abs(res.time - ft.time) < 300; + } + } + if (res.name !== ft.name) { return false } - if (Math.abs(res.time - ft.time) > 150) { return false } // TODO: find good epsilons - if (Math.abs(res.duration - ft.duration) > 100) { return false } + if (Math.abs(res.time - ft.time) > 250) { return false } // TODO: find good epsilons + if (Math.abs(res.duration - ft.duration) > 200) { return false } + return true })) .concat(fetchList)