Skip to content

Commit ff74162

Browse files
Adam RaineDevtools-frontend LUCI CQ
authored andcommitted
[RPP] Update image network details
https://screenshot.googleplex.com/7x8NZPFqUT5DCu7 - Preview image is moved above request details - Duplicate request URL & file size removed - "Preview" label removed Bug: 372897377 Change-Id: Ib15bc710b33df709ebb5f8334d51db3cab33f1d4 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6072712 Commit-Queue: Adam Raine <[email protected]> Reviewed-by: Paul Irish <[email protected]>
1 parent d90f272 commit ff74162

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

front_end/panels/timeline/components/NetworkRequestDetails.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ const UIStrings = {
4848
*@description Text in Timeline indicating that input has not happened recently
4949
*/
5050
no: 'No',
51-
/**
52-
*@description Text for previewing items
53-
*/
54-
preview: 'Preview',
5551
/**
5652
*@description Text to indicate to the user they are viewing an event representing a network request.
5753
*/
@@ -296,14 +292,15 @@ export class NetworkRequestDetails extends HTMLElement {
296292
this.#networkRequest.args.data.url as Platform.DevToolsPath.UrlString),
297293
precomputedFeatures: undefined,
298294
align: LegacyComponents.ImagePreview.Align.START,
295+
hideFileData: true,
299296
}) as HTMLImageElement);
300297

301298
this.#requestPreviewElements.set(this.#networkRequest, previewElement);
302299
}
303300

304301
const requestPreviewElement = this.#requestPreviewElements.get(this.#networkRequest);
305302
if (requestPreviewElement) {
306-
return this.#renderRow(i18nString(UIStrings.preview), requestPreviewElement);
303+
return html`<div class="network-request-details-row">${requestPreviewElement}</div>`;
307304
}
308305
return null;
309306
}
@@ -318,6 +315,7 @@ export class NetworkRequestDetails extends HTMLElement {
318315
const output = html`
319316
${this.#renderTitle()}
320317
${this.#renderURL()}
318+
${await this.#renderPreviewElement()}
321319
<div class="network-request-details-cols">
322320
<div class="network-request-details-col">
323321
${this.#renderRow(i18nString(UIStrings.requestMethod), networkData.requestMethod)}
@@ -335,7 +333,6 @@ export class NetworkRequestDetails extends HTMLElement {
335333
</div>
336334
</div>
337335
${this.#renderInitiatedBy()}
338-
${await this.#renderPreviewElement()}
339336
`; // The last items are outside the 2 column layout because InitiatedBy can be very wide
340337
// clang-format on
341338
LitHtml.render(output, this.#shadow, {host: this});

front_end/ui/legacy/components/utils/ImagePreview.ts

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export class ImagePreview {
7676
precomputedFeatures: (PrecomputedFeatures|undefined),
7777
imageAltText: (string|undefined),
7878
align: Align,
79+
hideFileData?: boolean,
7980
}|undefined = {precomputedFeatures: undefined, imageAltText: undefined, align: Align.CENTER}):
8081
Promise<Element|null> {
8182
const {precomputedFeatures, imageAltText, align} = options;
@@ -158,23 +159,25 @@ export class ImagePreview {
158159
}
159160
}
160161

161-
// File size
162-
const fileRow = container.createChild('tr', 'row');
163-
fileRow.createChild('td', `title ${align}`).textContent = i18nString(UIStrings.fileSize);
164-
fileRow.createChild('td', 'description').textContent = resourceSizeText;
165-
166-
// Current source
167-
const originalRow = container.createChild('tr', 'row');
168-
originalRow.createChild('td', `title ${align}`).textContent = i18nString(UIStrings.currentSource);
169-
170-
const sourceText = Platform.StringUtilities.trimMiddle(imageURL, 100);
171-
const sourceLink =
172-
(originalRow.createChild('td', 'description description-link').createChild('span', 'source-link') as
173-
HTMLLinkElement);
174-
sourceLink.textContent = sourceText;
175-
sourceLink.addEventListener('click', () => {
176-
Host.InspectorFrontendHost.InspectorFrontendHostInstance.openInNewTab(imageURL);
177-
});
162+
if (!options.hideFileData) {
163+
// File size
164+
const fileRow = container.createChild('tr', 'row');
165+
fileRow.createChild('td', `title ${align}`).textContent = i18nString(UIStrings.fileSize);
166+
fileRow.createChild('td', 'description').textContent = resourceSizeText;
167+
168+
// Current source
169+
const originalRow = container.createChild('tr', 'row');
170+
originalRow.createChild('td', `title ${align}`).textContent = i18nString(UIStrings.currentSource);
171+
172+
const sourceText = Platform.StringUtilities.trimMiddle(imageURL, 100);
173+
const sourceLink =
174+
(originalRow.createChild('td', 'description description-link').createChild('span', 'source-link') as
175+
HTMLLinkElement);
176+
sourceLink.textContent = sourceText;
177+
sourceLink.addEventListener('click', () => {
178+
Host.InspectorFrontendHost.InspectorFrontendHostInstance.openInNewTab(imageURL);
179+
});
180+
}
178181
resolve(shadowBoundary);
179182
}
180183
});

0 commit comments

Comments
 (0)