From 3d970e3f336dcb2e6e575f50f467bc84e07054f4 Mon Sep 17 00:00:00 2001
From: Jan Scheffler <janscheffler@chromium.org>
Date: Mon, 21 Oct 2019 14:19:07 +0200
Subject: [PATCH] Reland "[devtools] Add Url and Path Column to Network Log"

This is a reland of 12915a6957ebe9ca20ef30c0e5141ad1dee87a7d

Original change's description:
> [devtools] Add Url and Path Column to Network Log
>
> This patch adds url and path as available columns to
> the network log view and allows the name to be removed
> because it is not needed if the user decides to show
> the path or the whole url.
>
> Bug: chromium:993366
> Change-Id: Ib4600d1631bd436cb3c8b8e79b3709dddc38b166
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1809161
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Jan Scheffler <janscheffler@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#698891}

Bug: chromium:993366
Change-Id: I0061afbb7bdbc03cf3a7bd567530d21b66fa6d30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1823859
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#707746}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 923cd866fb089619bbbd971ff16cd7d766c1fb67
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1871557
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
---
 front_end/langpacks/shared_strings.grdp    |  3 +++
 front_end/network/NetworkDataGridNode.js   |  6 ++++++
 front_end/network/NetworkLogViewColumns.js | 16 ++++++++++++++--
 front_end/sdk/NetworkRequest.js            |  9 ++++++++-
 front_end/timeline/timeline_strings.grdp   |  3 ---
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/front_end/langpacks/shared_strings.grdp b/front_end/langpacks/shared_strings.grdp
index 0cacd66147..85f2069200 100644
--- a/front_end/langpacks/shared_strings.grdp
+++ b/front_end/langpacks/shared_strings.grdp
@@ -7,6 +7,9 @@
   <message name="IDS_DEVTOOLS_03301bd5f0d1517cf88b2f8348b82dfc" desc="Accessible text for the value in bytes in memory allocation or coverage view.">
     <ph name="THIS__COVERAGEINFO_SIZE_______">$1s<ex>12345</ex></ph> bytes
   </message>
+  <message name="IDS_DEVTOOLS_02a3a357710cc2a5dfdfb74ed012fb59" desc="Text in Timeline UIUtils of the Performance panel">
+    Url
+  </message>
   <message name="IDS_DEVTOOLS_040c4b52a3c06c6067fac76c4c7c3a2c" desc="Title of the 'Network conditions' tool in the bottom drawer">
     Network conditions
   </message>
diff --git a/front_end/network/NetworkDataGridNode.js b/front_end/network/NetworkDataGridNode.js
index 0b18695170..bb1da0cc45 100644
--- a/front_end/network/NetworkDataGridNode.js
+++ b/front_end/network/NetworkDataGridNode.js
@@ -729,6 +729,12 @@ Network.NetworkRequestNode = class extends Network.NetworkNode {
       case 'name':
         this._renderNameCell(cell);
         break;
+      case 'path':
+        this._setTextAndTitle(cell, this._request.pathname);
+        break;
+      case 'url':
+        this._setTextAndTitle(cell, this._request.url());
+        break;
       case 'method':
         this._setTextAndTitle(cell, this._request.requestMethod);
         break;
diff --git a/front_end/network/NetworkLogViewColumns.js b/front_end/network/NetworkLogViewColumns.js
index ca2d64ada4..58b0d8a36b 100644
--- a/front_end/network/NetworkLogViewColumns.js
+++ b/front_end/network/NetworkLogViewColumns.js
@@ -668,7 +668,6 @@ Network.NetworkLogViewColumns._defaultColumnConfig = {
   hideable: true,
   nonSelectable: true,
   isResponseHeader: false,
-  alwaysVisible: false,
   isCustomHeader: false
 };
 
@@ -684,9 +683,22 @@ Network.NetworkLogViewColumns._defaultColumns = [
     weight: 20,
     hideable: false,
     nonSelectable: false,
-    alwaysVisible: true,
     sortingFunction: Network.NetworkRequestNode.NameComparator
   },
+  {
+    id: 'path',
+    title: ls`Path`,
+    nonSelectable: false,
+    hideable: true,
+    sortingFunction: Network.NetworkRequestNode.RequestPropertyComparator.bind(null, 'path')
+  },
+  {
+    id: 'url',
+    title: ls`Url`,
+    nonSelectable: false,
+    hideable: true,
+    sortingFunction: Network.NetworkRequestNode.RequestPropertyComparator.bind(null, 'url')
+  },
   {
     id: 'method',
     title: Common.UIString('Method'),
diff --git a/front_end/sdk/NetworkRequest.js b/front_end/sdk/NetworkRequest.js
index fb9d05d1db..6f3b014ea5 100644
--- a/front_end/sdk/NetworkRequest.js
+++ b/front_end/sdk/NetworkRequest.js
@@ -642,6 +642,13 @@ export default class NetworkRequest extends Common.Object {
     return lastSlashIndex !== -1 ? path.substring(0, lastSlashIndex) : '';
   }
 
+  /**
+   * @return {string}
+   */
+  get pathname() {
+    return this._parsedURL.path;
+  }
+
   /**
    * @return {!Common.ResourceType}
    */
@@ -1645,4 +1652,4 @@ SDK.NetworkRequest.BlockedSetCookieWithReason;
   *   responseHeadersText: (string|undefined)
   * }}
   */
-SDK.NetworkRequest.ExtraResponseInfo;
\ No newline at end of file
+SDK.NetworkRequest.ExtraResponseInfo;
diff --git a/front_end/timeline/timeline_strings.grdp b/front_end/timeline/timeline_strings.grdp
index de624f6416..057d183e99 100644
--- a/front_end/timeline/timeline_strings.grdp
+++ b/front_end/timeline/timeline_strings.grdp
@@ -18,9 +18,6 @@
   <message name="IDS_DEVTOOLS_01ea16e89d02c33ef2a6a5db67665e0a" desc="Text in Timeline Flame Chart Data Provider of the Performance panel">
     Main — <ph name="TRACK_URL">$1s<ex>example.com</ex></ph>
   </message>
-  <message name="IDS_DEVTOOLS_02a3a357710cc2a5dfdfb74ed012fb59" desc="Text in Timeline UIUtils of the Performance panel">
-    Url
-  </message>
   <message name="IDS_DEVTOOLS_04cbdd8baeb482d9ff2e48b186479a06" desc="Text in Timeline UIUtils of the Performance panel">
     Streaming Wasm Response
   </message>