diff --git a/devtools/client/netmonitor/src/actions/requests.js b/devtools/client/netmonitor/src/actions/requests.js index 4364d2f39921..eb02138ef1a2 100644 --- a/devtools/client/netmonitor/src/actions/requests.js +++ b/devtools/client/netmonitor/src/actions/requests.js @@ -108,15 +108,13 @@ function sendCustomRequest(connector, requestId = null) { /** * Tell the backend to block future requests that match the URL of the selected one. */ -function blockSelectedRequestURL(connector) { - return (dispatch, getState) => { - const selected = getSelectedRequest(getState()); - - if (!selected) { +function blockSelectedRequestURL(connector, clickedRequest) { + return () => { + if (!clickedRequest) { return; } - const { url } = selected; + const { url } = clickedRequest; connector.blockRequest({ url }); }; } @@ -124,15 +122,13 @@ function blockSelectedRequestURL(connector) { /** * Tell the backend to unblock future requests that match the URL of the selected one. */ -function unblockSelectedRequestURL(connector) { - return (dispatch, getState) => { - const selected = getSelectedRequest(getState()); - - if (!selected) { +function unblockSelectedRequestURL(connector, clickedRequest) { + return () => { + if (!clickedRequest) { return; } - const { url } = selected; + const { url } = clickedRequest; connector.unblockRequest({ url }); }; } diff --git a/devtools/client/netmonitor/src/components/RequestListContent.js b/devtools/client/netmonitor/src/components/RequestListContent.js index fa427fe54670..2cb4fed66418 100644 --- a/devtools/client/netmonitor/src/components/RequestListContent.js +++ b/devtools/client/netmonitor/src/components/RequestListContent.js @@ -394,15 +394,15 @@ module.exports = connect( requestFilterTypes: state.filters.requestFilterTypes, }), (dispatch, props) => ({ - blockSelectedRequestURL: () => { - dispatch(Actions.blockSelectedRequestURL(props.connector)); + blockSelectedRequestURL: (clickedRequest) => { + dispatch(Actions.blockSelectedRequestURL(props.connector, clickedRequest)); }, cloneRequest: (id) => dispatch(Actions.cloneRequest(id)), openDetailsPanelTab: () => dispatch(Actions.openNetworkDetails(true)), sendCustomRequest: () => dispatch(Actions.sendCustomRequest(props.connector)), openStatistics: (open) => dispatch(Actions.openStatistics(props.connector, open)), - unblockSelectedRequestURL: () => { - dispatch(Actions.unblockSelectedRequestURL(props.connector)); + unblockSelectedRequestURL: (clickedRequest) => { + dispatch(Actions.unblockSelectedRequestURL(props.connector, clickedRequest)); }, /** * A handler that opens the stack trace tab when a stack trace is available diff --git a/devtools/client/netmonitor/src/widgets/RequestListContextMenu.js b/devtools/client/netmonitor/src/widgets/RequestListContextMenu.js index 546bc90413e4..7b97d5656245 100644 --- a/devtools/client/netmonitor/src/widgets/RequestListContextMenu.js +++ b/devtools/client/netmonitor/src/widgets/RequestListContextMenu.js @@ -218,14 +218,18 @@ class RequestListContextMenu { id: "request-list-context-block-url", label: L10N.getStr("netmonitor.context.blockURL"), visible: !!(clickedRequest && !blockedReason), - click: blockSelectedRequestURL, + click: () => { + blockSelectedRequestURL(clickedRequest); + }, }); menu.push({ id: "request-list-context-unblock-url", label: L10N.getStr("netmonitor.context.unblockURL"), visible: !!(clickedRequest && blockedReason), - click: unblockSelectedRequestURL, + click: () => { + unblockSelectedRequestURL(clickedRequest); + }, }); menu.push({