Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions front_end/panels/network/NetworkDataGridNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -506,4 +506,69 @@ describeWithEnvironment('NetworkLogView', () => {
const backgroundColorOfIcon = iconStyle.backgroundColor.toString();
assert.strictEqual(backgroundColorOfIcon, 'var(--icon-warning)');
});

it('uses x-fb-friendly-name from response headers when present', async () => {
const request = SDK.NetworkRequest.NetworkRequest.create(
'requestId' as Protocol.Network.RequestId, urlString`https://www.example.com/api/v1/users/12345`, urlString``,
null, null, null);
request.statusCode = 200;
request.responseHeaders = [{name: 'x-fb-friendly-name', value: 'GetUserProfile'}];

const networkRequestNode = new Network.NetworkDataGridNode.NetworkRequestNode(
{} as Network.NetworkDataGridNode.NetworkLogViewInterface, request);
const el = document.createElement('div');
networkRequestNode.renderCell(el, 'name');

// The cell should contain the friendly name instead of the default URL name
assert.include(el.textContent, 'GetUserProfile');
});

it('uses x-fb-friendly-name from request headers when not in response', async () => {
const request = SDK.NetworkRequest.NetworkRequest.create(
'requestId' as Protocol.Network.RequestId, urlString`https://www.example.com/graphql`, urlString``, null, null,
null);
request.statusCode = 200;
request.setRequestHeaders([{name: 'x-fb-friendly-name', value: 'CreatePost'}]);

const networkRequestNode = new Network.NetworkDataGridNode.NetworkRequestNode(
{} as Network.NetworkDataGridNode.NetworkLogViewInterface, request);
const el = document.createElement('div');
networkRequestNode.renderCell(el, 'name');

// The cell should contain the friendly name from request headers
assert.include(el.textContent, 'CreatePost');
});

it('uses default name when x-fb-friendly-name is not present', async () => {
const request = SDK.NetworkRequest.NetworkRequest.create(
'requestId' as Protocol.Network.RequestId, urlString`https://www.example.com/test.js`, urlString``, null, null,
null);
request.statusCode = 200;

const networkRequestNode = new Network.NetworkDataGridNode.NetworkRequestNode(
{} as Network.NetworkDataGridNode.NetworkLogViewInterface, request);
const el = document.createElement('div');
networkRequestNode.renderCell(el, 'name');

// The cell should contain the default name (test.js)
assert.include(el.textContent, 'test.js');
});

it('prefers response header x-fb-friendly-name over request header', async () => {
const request = SDK.NetworkRequest.NetworkRequest.create(
'requestId' as Protocol.Network.RequestId, urlString`https://www.example.com/api/data`, urlString``, null, null,
null);
request.statusCode = 200;
request.responseHeaders = [{name: 'x-fb-friendly-name', value: 'ResponseName'}];
request.setRequestHeaders([{name: 'x-fb-friendly-name', value: 'RequestName'}]);

const networkRequestNode = new Network.NetworkDataGridNode.NetworkRequestNode(
{} as Network.NetworkDataGridNode.NetworkLogViewInterface, request);
const el = document.createElement('div');
networkRequestNode.renderCell(el, 'name');

// The cell should contain the response header value, not the request header value
assert.include(el.textContent, 'ResponseName');
assert.notInclude(el.textContent, 'RequestName');
});
});
10 changes: 8 additions & 2 deletions front_end/panels/network/NetworkDataGridNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,10 @@ export class NetworkRequestNode extends NetworkNode {
}

override displayName(): string {
return this.requestInternal.name();
// [RN] Check for x-fb-friendly-name header in response or request headers
const friendlyName = this.requestInternal.responseHeaderValue('x-fb-friendly-name') ||
this.requestInternal.requestHeaderValue('x-fb-friendly-name');
return friendlyName || this.requestInternal.name();
}

override request(): SDK.NetworkRequest.NetworkRequest {
Expand Down Expand Up @@ -1126,7 +1129,10 @@ export class NetworkRequestNode extends NetworkNode {
cell.appendChild(secondIconElement);
}
}
const name = Platform.StringUtilities.trimMiddle(this.requestInternal.name(), 100);
// [RN] Check for x-fb-friendly-name header in response or request headers
const friendlyName = this.requestInternal.responseHeaderValue('x-fb-friendly-name') ||
this.requestInternal.requestHeaderValue('x-fb-friendly-name');
const name = Platform.StringUtilities.trimMiddle(friendlyName || this.requestInternal.name(), 100);
const networkManager = SDK.NetworkManager.NetworkManager.forRequest(this.requestInternal);
UI.UIUtils.createTextChild(cell, networkManager ? networkManager.target().decorateLabel(name) : name);
this.appendSubtitle(cell, this.requestInternal.path());
Expand Down
Loading