Skip to content

Commit 102f7a5

Browse files
committed
Merge branch 'main' of github.com:usebruno/bruno
2 parents 1949836 + be857d7 commit 102f7a5

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

Diff for: packages/bruno-app/src/components/ResponsePane/Overlay/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ResponseLoadingOverlay = ({ item, collection }) => {
1717
<div className="overlay">
1818
<div style={{ marginBottom: 15, fontSize: 26 }}>
1919
<div style={{ display: 'inline-block', fontSize: 20, marginLeft: 5, marginRight: 5 }}>
20-
<StopWatch />
20+
<StopWatch requestTimestamp={item?.requestSent?.timestamp} />
2121
</div>
2222
</div>
2323
<IconRefresh size={24} className="loading-icon" />

Diff for: packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RequestMethod/StyledWrapper.js

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const Wrapper = styled.div`
66
align-self: stretch;
77
align-items: center;
88
min-width: 34px;
9+
flex-shrink: 0;
910
1011
span {
1112
position: relative;

Diff for: packages/bruno-app/src/components/StopWatch/index.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useEffect } from 'react';
22

3-
const StopWatch = () => {
3+
const StopWatch = ({ requestTimestamp }) => {
44
const [milliseconds, setMilliseconds] = useState(0);
55

66
const tickInterval = 200;
@@ -15,6 +15,10 @@ const StopWatch = () => {
1515
};
1616
});
1717

18+
useEffect(() => {
19+
setMilliseconds(Date.now() - requestTimestamp);
20+
}, [requestTimestamp]);
21+
1822
if (milliseconds < 1000) {
1923
return 'Loading...';
2024
}

Diff for: packages/bruno-electron/src/ipc/network/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ const registerNetworkIpc = (mainWindow) => {
195195
url: request.url,
196196
method: request.method,
197197
headers: request.headers,
198-
data: safeParseJSON(safeStringifyJSON(request.data))
198+
data: safeParseJSON(safeStringifyJSON(request.data)),
199+
timestamp: Date.now()
199200
},
200201
collectionUid,
201202
itemUid: item.uid,

0 commit comments

Comments
 (0)