Skip to content

Commit cee49a9

Browse files
and-oliDevtools-frontend LUCI CQ
authored andcommitted
[RPP] Fix network request details layout
Margins and spacing between items was off. Before: https://screenshot.googleplex.com/3Rz759PHWKxbFqp After: https://screenshot.googleplex.com/3xTGaLkE2E5dqco Fixed: 406990013 Change-Id: I5f7ec7f1bb2ad5b5a2fab0acf5fc6eae3edfedb8 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6404821 Commit-Queue: Jack Franklin <[email protected]> Reviewed-by: Jack Franklin <[email protected]>
1 parent cb1e1ed commit cee49a9

File tree

4 files changed

+27
-23
lines changed

4 files changed

+27
-23
lines changed

front_end/panels/timeline/TimelineDetailsView.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ describeWithEnvironment('TimelineDetailsView', function() {
5353

5454
const content = detailsContentElement.firstElementChild?.shadowRoot;
5555
assert(content);
56-
assert.lengthOf(content.querySelectorAll('div.network-request-details-row'), 11);
56+
assert.lengthOf(content.querySelectorAll('div.network-request-details-row'), 9);
57+
assert.lengthOf(content.querySelectorAll('div.network-request-details-item'), 2);
5758
assert.lengthOf(content.querySelectorAll('devtools-related-insight-chips'), 1);
5859
});
5960

front_end/panels/timeline/components/NetworkRequestDetails.test.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,17 @@ describeWithMockConnection('NetworkRequestDetails', () => {
118118
});
119119

120120
function getRowDataForDetailsElement(details: ShadowRoot) {
121-
return Array.from(details.querySelectorAll<HTMLDivElement>('.network-request-details-row, .timing-rows')).map(row => {
122-
const title = row.querySelector<HTMLDivElement>('.title')?.innerText;
123-
let value = cleanTextContent(row.querySelector<HTMLDivElement>('.value')?.innerText || '');
124-
if (!title && !value) {
125-
value = cleanTextContent(row.innerText || '');
126-
}
127-
return {title, value};
128-
});
121+
return Array
122+
.from(details.querySelectorAll<HTMLDivElement>(
123+
'.network-request-details-item, .network-request-details-row, .timing-rows'))
124+
.map(row => {
125+
const title = row.querySelector<HTMLDivElement>('.title')?.innerText;
126+
let value = cleanTextContent(row.querySelector<HTMLDivElement>('.value')?.innerText || '');
127+
if (!title && !value) {
128+
value = cleanTextContent(row.innerText || '');
129+
}
130+
return {title, value};
131+
});
129132
}
130133

131134
function getServerTimingDataDetailsElement(details: ShadowRoot) {

front_end/panels/timeline/components/NetworkRequestDetails.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ export class NetworkRequestDetails extends HTMLElement {
244244
</devtools-request-link-icon>
245245
`;
246246
// clang-format on
247-
return html`<div class="network-request-details-row network-request-url">${urlElement}</div>`;
247+
return html`<div class="network-request-details-item">${urlElement}</div>`;
248248
}
249249

250-
return html`<div class="network-request-details-row network-request-url">${linkifiedURL}</div>`;
250+
return html`<div class="network-request-details-item">${linkifiedURL}</div>`;
251251
}
252252

253253
#renderFromCache(): Lit.TemplateResult|null {
@@ -298,33 +298,33 @@ export class NetworkRequestDetails extends HTMLElement {
298298
}
299299

300300
const hasStackTrace = Trace.Helpers.Trace.stackTraceInEvent(this.#networkRequest) !== null;
301-
301+
let link: HTMLElement|null = null;
302302
// If we have a stack trace, that is the most reliable way to get the initiator data and display a link to the source.
303303
if (hasStackTrace) {
304304
const topFrame = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(this.#networkRequest)?.at(0) ?? null;
305305
if (topFrame) {
306-
const link = this.#linkifier.maybeLinkifyConsoleCallFrame(
306+
link = this.#linkifier.maybeLinkifyConsoleCallFrame(
307307
this.#maybeTarget, topFrame, {tabStop: true, inlineFrameIndex: 0, showColumnNumber: true});
308-
if (link) {
309-
return this.#renderRow(i18nString(UIStrings.initiatedBy), link);
310-
}
311308
}
312309
}
313310
// If we do not, we can see if the network handler found an initiator and try to link by URL
314311
const initiator = this.#parsedTrace?.NetworkRequests.eventToInitiator.get(this.#networkRequest);
315312
if (initiator) {
316-
const link = this.#linkifier.maybeLinkifyScriptLocation(
313+
link = this.#linkifier.maybeLinkifyScriptLocation(
317314
this.#maybeTarget,
318315
null, // this would be the scriptId, but we don't have one. The linkifier will fallback to using the URL.
319316
initiator.args.data.url as Platform.DevToolsPath.UrlString,
320317
undefined, // line number
321318
);
322-
if (link) {
323-
return this.#renderRow(i18nString(UIStrings.initiatedBy), link);
324-
}
325319
}
326320

327-
return null;
321+
if (!link) {
322+
return null;
323+
}
324+
return html`
325+
<div class="network-request-details-item"><div class="title">${
326+
i18nString(UIStrings.initiatedBy)}</div><div class="value">${link}</div></div>
327+
`;
328328
}
329329

330330
#renderBlockingRow(): Lit.TemplateResult|null {
@@ -368,7 +368,7 @@ export class NetworkRequestDetails extends HTMLElement {
368368

369369
const requestPreviewElement = this.#requestPreviewElements.get(this.#networkRequest);
370370
if (requestPreviewElement) {
371-
return html`<div class="network-request-details-row">${requestPreviewElement}</div>`;
371+
return html`<div class="network-request-details-item">${requestPreviewElement}</div>`;
372372
}
373373
return null;
374374
}

front_end/panels/timeline/components/networkRequestDetails.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
gap: 0;
5151
}
5252

53-
.network-request-details-col, .network-request-url {
53+
.network-request-details-item, .network-request-details-col {
5454
padding: 5px 10px;
5555
}
5656

0 commit comments

Comments
 (0)