From 208e94e623f9abe01155c3f7507c3e21636d4585 Mon Sep 17 00:00:00 2001 From: ronlanger Date: Thu, 25 Mar 2021 09:40:46 +0200 Subject: [PATCH] fix (interceptor): filter webpack hot update url from log --- lib/ui/components/RequestLogs/RequestLog.js | 3 ++- lib/ui/constants/excluded-urls.js | 3 +++ lib/ui/utils/filters.js | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 lib/ui/constants/excluded-urls.js diff --git a/lib/ui/components/RequestLogs/RequestLog.js b/lib/ui/components/RequestLogs/RequestLog.js index cde2db8e..6800194d 100644 --- a/lib/ui/components/RequestLogs/RequestLog.js +++ b/lib/ui/components/RequestLogs/RequestLog.js @@ -5,7 +5,7 @@ import API from 'api'; import EVENTS from 'api/constants/events'; import RequestLogState from 'ui/states/RequestLogState'; import { connectToState } from 'ui/states/connector'; -import { filterLogByType } from 'ui/utils/filters'; +import { filterLogByType, filterByIgnoreList } from 'ui/utils/filters'; import { RequestOptionSpacer } from 'ui/components/QuickEdit/styled'; import Frame from 'ui/components/common/Frame'; import HeaderCell from 'ui/components/RequestLogs/HeaderCell'; @@ -58,6 +58,7 @@ class RequestLog extends React.Component { return API.capturedRequests .filter((request) => includes(request.url, RequestLogState.query)) .filter(filterLogByType) + .filter(filterByIgnoreList) .map(renderRequestRow) .reverse(); }; diff --git a/lib/ui/constants/excluded-urls.js b/lib/ui/constants/excluded-urls.js new file mode 100644 index 00000000..98a4f0a6 --- /dev/null +++ b/lib/ui/constants/excluded-urls.js @@ -0,0 +1,3 @@ +export const EXCLUDED_URLS = [/hot-update.json/] + +export default EXCLUDED_URLS diff --git a/lib/ui/utils/filters.js b/lib/ui/utils/filters.js index 30671f17..bf7689a5 100644 --- a/lib/ui/utils/filters.js +++ b/lib/ui/utils/filters.js @@ -1,5 +1,6 @@ import MocksState from 'ui/states/MocksState'; import RequestLogState from 'ui/states/RequestLogState'; +import EXCLUDED_URLS from 'ui/constants/excluded-urls'; export const filterMocksByType = (mock) => { const status = mock.response.status; @@ -43,3 +44,14 @@ export const filterLogByType = (request) => { return true; } }; + +export const glob = (pattern, input) => { + return pattern.test(input); +} + +export const filterByIgnoreList = (request) => { + const hasMatch = EXCLUDED_URLS.some((ignorePattern) => { + return glob(ignorePattern, request.url) + }) + return !hasMatch; +}