From 638ecd8edcc0de147e3d60cea93c5edb1c075767 Mon Sep 17 00:00:00 2001 From: Maayan Glikser Date: Thu, 16 Mar 2017 22:49:40 +0200 Subject: [PATCH] Fix (Log): show request mock response when available --- lib/ui/components/RequestLogs/RequestRow.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ui/components/RequestLogs/RequestRow.js b/lib/ui/components/RequestLogs/RequestRow.js index 56911672..d000f0a4 100644 --- a/lib/ui/components/RequestLogs/RequestRow.js +++ b/lib/ui/components/RequestLogs/RequestRow.js @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; import find from 'lodash/find'; +import get from 'lodash/get'; import API from 'api'; import UIState from 'ui/states/UIState'; import MocksState from 'ui/states/MocksState'; @@ -61,7 +62,7 @@ const editRequest = (request) => (event) => { const matchingMocks = API.getMatchingMocks(request); const activeMock = find(matchingMocks, { isActive: true }); const disabledMock = find(matchingMocks, { isActive: false }); - + const mock = activeMock || disabledMock || API.mockRequest(request); MocksState.selectItems([mock]); @@ -112,7 +113,7 @@ const RequestRow = ({ request, onSelect, selected, getCellWidth, query }) => ( - { request.response.body } + { get(request, 'mock.response.body', request.response.body) } { @@ -125,4 +126,4 @@ const RequestRow = ({ request, onSelect, selected, getCellWidth, query }) => ( ); -export default RequestRow; \ No newline at end of file +export default RequestRow;