Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Filters tests #310

Open
wants to merge 4 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"presets": [
["es2015", { "modules": false }],
"react"
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"lodash",
"transform-object-rest-spread",
"transform-class-properties",
"styled-components"
"styled-components",
"@babel/plugin-proposal-class-properties"
]
}
3 changes: 2 additions & 1 deletion lib/ui/components/RequestLogs/RequestLog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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();
};
Expand Down
3 changes: 3 additions & 0 deletions lib/ui/constants/excluded-urls.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const EXCLUDED_URLS = [/hot-update.json/]

export default EXCLUDED_URLS
12 changes: 12 additions & 0 deletions lib/ui/utils/filters.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
}
Loading