Skip to content

Commit 3bd35c5

Browse files
committed
Add timestamp and duration to rest of the lists
1 parent 02d16c6 commit 3bd35c5

File tree

1 file changed

+47
-36
lines changed

1 file changed

+47
-36
lines changed

src/components/view/view-event-list.tsx

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ const RowPin = styled(
116116
117117
${(p: { pinned: boolean }) =>
118118
p.pinned
119-
? `
119+
? `
120120
width: auto;
121121
padding: 8px 7px;
122122
&& { margin-right: -3px; }
123123
`
124-
: `
124+
: `
125125
padding: 8px 0;
126126
width: 0 !important;
127127
margin: 0 !important;
@@ -177,8 +177,8 @@ const Method = styled(Column)`
177177
transition: flex-basis 0.1s;
178178
${(p: { pinned?: boolean }) =>
179179
p.pinned
180-
? 'flex-basis: 50px;'
181-
: 'flex-basis: 71px;'
180+
? 'flex-basis: 50px;'
181+
: 'flex-basis: 71px;'
182182
}
183183
184184
flex-shrink: 0;
@@ -246,8 +246,8 @@ const EventTypeColumn = styled(Column)`
246246
transition: flex-basis 0.1s;
247247
${(p: { pinned?: boolean }) =>
248248
p.pinned
249-
? 'flex-basis: 109px;'
250-
: 'flex-basis: 130px;'
249+
? 'flex-basis: 109px;'
250+
: 'flex-basis: 130px;'
251251
}
252252
253253
margin-right: 6px !important;
@@ -299,6 +299,7 @@ const EventListRow = styled.div<{ role: 'row' }>`
299299
300300
color: ${p => p.theme.highlightColor};
301301
fill: ${p => p.theme.highlightColor};
302+
302303
* {
303304
/* Override status etc colours to ensure contrast & give row max visibility */
304305
color: ${p => p.theme.highlightColor};
@@ -331,13 +332,7 @@ const TrafficEventListRow = styled(EventListRow)`
331332

332333
const TlsListRow = styled(EventListRow)`
333334
height: 28px !important; /* Important required to override react-window's style attr */
334-
margin: 2px 0;
335-
336-
font-style: italic;
337-
justify-content: center;
338-
text-align: center;
339-
340-
opacity: 0.7;
335+
margin: 2px 0 2px 20px;
341336
342337
&:hover {
343338
opacity: 1;
@@ -350,6 +345,13 @@ const TlsListRow = styled(EventListRow)`
350345
}
351346
`;
352347

348+
const TlsRowDescription = styled(Column)`
349+
flex-grow: 1;
350+
font-style: italic;
351+
justify-content: center;
352+
text-align: center;
353+
opacity: 0.7;
354+
`;
353355
export const TableHeaderRow = styled.div<{ role: 'row' }>`
354356
height: 38px;
355357
overflow: hidden;
@@ -588,8 +590,9 @@ const RTCConnectionRow = observer(({
588590
className={isSelected ? 'selected' : ''}
589591
style={style}
590592
>
591-
<RowPin pinned={pinned}/>
593+
<RowPin pinned={pinned} />
592594
<RowMarker role='cell' category={category} title={describeEventCategory(category)} />
595+
<Timestamp role='cell' /> //TODO: Expose timingEvents
593596
<EventTypeColumn role='cell'>
594597
{ !event.closeState && <ConnectedSpinnerIcon /> } WebRTC
595598
</EventTypeColumn>
@@ -656,8 +659,9 @@ const RTCStreamRow = observer(({
656659
className={isSelected ? 'selected' : ''}
657660
style={style}
658661
>
659-
<RowPin pinned={pinned}/>
662+
<RowPin pinned={pinned} />
660663
<RowMarker role='cell' category={category} title={describeEventCategory(category)} />
664+
<Timestamp role='cell' /> //TODO: Expose timingEvents
661665
<EventTypeColumn role='cell'>
662666
{ !event.closeState && <ConnectedSpinnerIcon /> } WebRTC {
663667
event.isRTCDataChannel()
@@ -746,10 +750,11 @@ const BuiltInApiRow = observer((p: {
746750
className={p.isSelected ? 'selected' : ''}
747751
style={p.style}
748752
>
749-
<RowPin pinned={pinned}/>
753+
<RowPin pinned={pinned} />
750754
<RowMarker role='cell' category={category} title={describeEventCategory(category)} />
755+
<Timestamp role='cell' timestamp={request.timingEvents.startTime} />
751756
<EventTypeColumn role='cell'>
752-
{ api.service.shortName }: { apiOperationName }
757+
{api.service.shortName}: {apiOperationName}
753758
</EventTypeColumn>
754759
<Source role='cell' title={request.source.summary}>
755760
<Icon
@@ -758,8 +763,9 @@ const BuiltInApiRow = observer((p: {
758763
/>
759764
</Source>
760765
<BuiltInApiRequestDetails role='cell'>
761-
{ apiRequestDescription }
766+
{apiRequestDescription}
762767
</BuiltInApiRequestDetails>
768+
<Duration role='cell' exchange={p.exchange} />
763769
</TrafficEventListRow>
764770
});
765771

@@ -783,24 +789,29 @@ const TlsRow = observer((p: {
783789

784790
const connectionTarget = tlsEvent.upstreamHostname || 'unknown domain';
785791

786-
return <TlsListRow
787-
role="row"
788-
aria-label={`${description} connection to ${connectionTarget}`}
789-
aria-rowindex={p.index + 1}
790-
data-event-id={tlsEvent.id}
791-
tabIndex={p.isSelected ? 0 : -1}
792-
793-
className={p.isSelected ? 'selected' : ''}
794-
style={p.style}
795-
>
796-
{
797-
tlsEvent.isTlsTunnel() &&
798-
tlsEvent.isOpen() &&
799-
<ConnectedSpinnerIcon />
800-
} {
801-
description
802-
} connection to { connectionTarget }
803-
</TlsListRow>
792+
return (
793+
<TlsListRow
794+
role="row"
795+
aria-label={`${description} connection to ${connectionTarget}`}
796+
aria-rowindex={p.index + 1}
797+
data-event-id={tlsEvent.id}
798+
tabIndex={p.isSelected ? 0 : -1}
799+
className={p.isSelected ? 'selected' : ''}
800+
style={p.style}
801+
802+
>
803+
<Timestamp role='cell' timestamp={tlsEvent.timingEvents.startTime} />
804+
<TlsRowDescription role='cell'>
805+
{
806+
tlsEvent.isTlsTunnel() &&
807+
tlsEvent.isOpen() &&
808+
<ConnectedSpinnerIcon />
809+
} {
810+
description
811+
} connection to {connectionTarget}
812+
</TlsRowDescription>
813+
</TlsListRow>
814+
);
804815
});
805816

806817
@observer

0 commit comments

Comments
 (0)