report: specify transfer or resource size for columns

GoogleChrome · Apr 6, 2020 · ae0f076 · ae0f076
1 parent 2f3da7d
commit ae0f076
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 42 deletions.
diff --git a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
@@ -77,7 +77,7 @@ class EfficientAnimatedContent extends ByteEfficiencyAudit {
     /** @type {LH.Audit.Details.Opportunity['headings']} */
     const headings = [
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnResourceSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/offscreen-images.js b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
@@ -228,7 +228,7 @@ class OffscreenImages extends ByteEfficiencyAudit {
     const headings = [
       {key: 'url', valueType: 'thumbnail', label: ''},
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnResourceSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
@@ -216,7 +216,7 @@ class RenderBlockingResources extends Audit {
     /** @type {LH.Audit.Details.Opportunity['headings']} */
     const headings = [
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnTransferSize)},
       {key: 'wastedMs', valueType: 'timespanMs', label: str_(i18n.UIStrings.columnWastedMs)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
@@ -92,7 +92,7 @@ class TotalByteWeight extends ByteEfficiencyAudit {
     /** @type {LH.Audit.Details.Table['headings']} */
     const headings = [
       {key: 'url', itemType: 'url', text: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', itemType: 'bytes', text: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', itemType: 'bytes', text: str_(i18n.UIStrings.columnTransferSize)},
     ];
 
     const tableDetails = ByteEfficiencyAudit.makeTableDetails(headings, results);

diff --git a/lighthouse-core/audits/byte-efficiency/unminified-css.js b/lighthouse-core/audits/byte-efficiency/unminified-css.js
@@ -105,7 +105,7 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
     /** @type {LH.Audit.Details.Opportunity['headings']} */
     const headings = [
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnTransferSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
@@ -102,7 +102,7 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
     /** @type {LH.Audit.Details.Opportunity['headings']} */
     const headings = [
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnTransferSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
@@ -56,7 +56,7 @@ class UnusedCSSRules extends ByteEfficiencyAudit {
     /** @type {LH.Audit.Details.Opportunity['headings']} */
     const headings = [
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnTransferSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/unused-javascript.js b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
@@ -256,7 +256,7 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
       headings: [
         /* eslint-disable max-len */
         {key: 'url', valueType: 'url', subRows: {key: 'sources', valueType: 'code'}, label: str_(i18n.UIStrings.columnURL)},
-        {key: 'totalBytes', valueType: 'bytes', subRows: {key: 'sourceBytes'}, label: str_(i18n.UIStrings.columnSize)},
+        {key: 'totalBytes', valueType: 'bytes', subRows: {key: 'sourceBytes'}, label: str_(i18n.UIStrings.columnTransferSize)},
         {key: 'wastedBytes', valueType: 'bytes', subRows: {key: 'sourceWastedBytes'}, label: str_(i18n.UIStrings.columnWastedBytes)},
         /* eslint-enable max-len */
       ],

diff --git a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
@@ -276,7 +276,7 @@ class CacheHeaders extends Audit {
         // TODO(i18n): pre-compute localized duration
         {key: 'cacheLifetimeMs', itemType: 'ms', text: str_(i18n.UIStrings.columnCacheTTL),
           displayUnit: 'duration'},
-        {key: 'totalBytes', itemType: 'bytes', text: str_(i18n.UIStrings.columnSize),
+        {key: 'totalBytes', itemType: 'bytes', text: str_(i18n.UIStrings.columnTransferSize),
           displayUnit: 'kb', granularity: 1},
       ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
@@ -119,7 +119,7 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
     const headings = [
       {key: 'url', valueType: 'thumbnail', label: ''},
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnResourceSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
@@ -140,7 +140,7 @@ class UsesResponsiveImages extends ByteEfficiencyAudit {
     const headings = [
       {key: 'url', valueType: 'thumbnail', label: ''},
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnResourceSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
@@ -85,7 +85,7 @@ class ResponsesAreCompressed extends ByteEfficiencyAudit {
     /** @type {LH.Audit.Details.Opportunity['headings']} */
     const headings = [
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnTransferSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/byte-efficiency/uses-webp-images.js b/lighthouse-core/audits/byte-efficiency/uses-webp-images.js
@@ -118,7 +118,7 @@ class UsesWebPImages extends ByteEfficiencyAudit {
     const headings = [
       {key: 'url', valueType: 'thumbnail', label: ''},
       {key: 'url', valueType: 'url', label: str_(i18n.UIStrings.columnURL)},
-      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnSize)},
+      {key: 'totalBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnResourceSize)},
       {key: 'wastedBytes', valueType: 'bytes', label: str_(i18n.UIStrings.columnWastedBytes)},
     ];
 

diff --git a/lighthouse-core/audits/third-party-summary.js b/lighthouse-core/audits/third-party-summary.js
@@ -156,7 +156,7 @@ class ThirdPartySummary extends Audit {
     const headings = [
       {key: 'entity', itemType: 'link', text: str_(UIStrings.columnThirdParty)},
       {key: 'transferSize', granularity: 1, itemType: 'bytes',
-        text: str_(i18n.UIStrings.columnSize)},
+        text: str_(i18n.UIStrings.columnTransferSize)},
       {key: 'blockingTime', granularity: 1, itemType: 'ms',
         text: str_(UIStrings.columnBlockingTime)},
     ];

diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
@@ -56,8 +56,12 @@ const UIStrings = {
   displayValueMsSavings: 'Potential savings of {wastedMs, number, milliseconds}\xa0ms',
   /** Label for a column in a data table; entries will be the URL of a web resource */
   columnURL: 'URL',
-  /** Label for a column in a data table; entries will be the size of a web resource in kilobytes. */
+  /** Label for a column in a data table; entries will be the size or quantity of some resource, e.g. the width and height dimensions of an image or the number of images in a web page. */
   columnSize: 'Size',
+  /** Label for a column in a data table; entries will be the file size of a web resource in kilobytes. */
+  columnResourceSize: 'Resource Size',
+  /** Label for a column in a data table; entries will be the download size of a web resource in kilobytes. */
+  columnTransferSize: 'Transfer Size',
   /** Label for a column in a data table; entries will be the time to live value of the cache header on a web resource. */
   columnCacheTTL: 'Cache TTL',
   /** Label for a column in a data table; entries will be the number of kilobytes the user could reduce their page by if they implemented the suggestions. */
@@ -72,8 +76,6 @@ const UIStrings = {
   columnResourceType: 'Resource Type',
   /** Label for a column in a data table; entries will be the number of network requests done by a webpage. */
   columnRequests: 'Requests',
-  /** Label for a column in a data table; entries will be the number of kilobytes transferred to load a set of files. */
-  columnTransferSize: 'Transfer Size',
   /** Label for a column in a data table; entries will be the names of arbitrary objects, e.g. the name of a Javascript library, or the name of a user defined timing event. */
   columnName: 'Name',
   /** Label for a column in a data table; entries will be the names of JavaScript code, e.g. the name of a Javascript package or module. */

diff --git a/lighthouse-core/lib/i18n/locales/en-US.json b/lighthouse-core/lib/i18n/locales/en-US.json
@@ -1433,6 +1433,9 @@
   "lighthouse-core/lib/i18n/i18n.js | columnRequests": {
     "message": "Requests"
   },
+  "lighthouse-core/lib/i18n/i18n.js | columnResourceSize": {
+    "message": "Resource Size"
+  },
   "lighthouse-core/lib/i18n/i18n.js | columnResourceType": {
     "message": "Resource Type"
   },

diff --git a/lighthouse-core/lib/i18n/locales/en-XL.json b/lighthouse-core/lib/i18n/locales/en-XL.json
@@ -1433,6 +1433,9 @@
   "lighthouse-core/lib/i18n/i18n.js | columnRequests": {
     "message": "R̂éq̂úêśt̂ś"
   },
+  "lighthouse-core/lib/i18n/i18n.js | columnResourceSize": {
+    "message": "R̂éŝóûŕĉé Ŝíẑé"
+  },
   "lighthouse-core/lib/i18n/i18n.js | columnResourceType": {
     "message": "R̂éŝóûŕĉé T̂ýp̂é"
   },

diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
@@ -1683,7 +1683,7 @@
             "key": "transferSize",
             "granularity": 1,
             "itemType": "bytes",
-            "text": "Size"
+            "text": "Transfer Size"
           },
           {
             "key": "blockingTime",
@@ -2445,7 +2445,7 @@
           {
             "key": "totalBytes",
             "itemType": "bytes",
-            "text": "Size",
+            "text": "Transfer Size",
             "displayUnit": "kb",
             "granularity": 1
           }
@@ -2547,7 +2547,7 @@
           {
             "key": "totalBytes",
             "itemType": "bytes",
-            "text": "Size"
+            "text": "Transfer Size"
           }
         ],
         "items": [
@@ -2632,7 +2632,7 @@
           {
             "key": "totalBytes",
             "valueType": "bytes",
-            "label": "Size"
+            "label": "Transfer Size"
           },
           {
             "key": "wastedMs",
@@ -2708,7 +2708,7 @@
           {
             "key": "totalBytes",
             "valueType": "bytes",
-            "label": "Size"
+            "label": "Transfer Size"
           },
           {
             "key": "wastedBytes",
@@ -2788,7 +2788,7 @@
           {
             "key": "totalBytes",
             "valueType": "bytes",
-            "label": "Size"
+            "label": "Resource Size"
           },
           {
             "key": "wastedBytes",
@@ -2847,7 +2847,7 @@
           {
             "key": "totalBytes",
             "valueType": "bytes",
-            "label": "Size"
+            "label": "Transfer Size"
           },
           {
             "key": "wastedBytes",
@@ -6056,7 +6056,13 @@
       ],
       "lighthouse-core/lib/i18n/i18n.js | columnTransferSize": [
         "audits[performance-budget].details.headings[2].text",
-        "audits[resource-summary].details.headings[2].text"
+        "audits[resource-summary].details.headings[2].text",
+        "audits[third-party-summary].details.headings[1].text",
+        "audits[uses-long-cache-ttl].details.headings[2].text",
+        "audits[total-byte-weight].details.headings[1].text",
+        "audits[render-blocking-resources].details.headings[1].label",
+        "audits[unminified-javascript].details.headings[1].label",
+        "audits[uses-text-compression].details.headings[1].label"
       ],
       "lighthouse-core/lib/i18n/i18n.js | columnOverBudget": [
         "audits[performance-budget].details.headings[4].text",
@@ -6168,16 +6174,6 @@
       "lighthouse-core/audits/third-party-summary.js | columnThirdParty": [
         "audits[third-party-summary].details.headings[0].text"
       ],
-      "lighthouse-core/lib/i18n/i18n.js | columnSize": [
-        "audits[third-party-summary].details.headings[1].text",
-        "audits[uses-long-cache-ttl].details.headings[2].text",
-        "audits[total-byte-weight].details.headings[1].text",
-        "audits[render-blocking-resources].details.headings[1].label",
-        "audits[unminified-javascript].details.headings[1].label",
-        "audits[uses-webp-images].details.headings[2].label",
-        "audits[uses-text-compression].details.headings[1].label",
-        "audits[tap-targets].details.headings[1].text"
-      ],
       "lighthouse-core/audits/third-party-summary.js | columnBlockingTime": [
         "audits[third-party-summary].details.headings[2].text"
       ],
@@ -6560,6 +6556,9 @@
       "lighthouse-core/audits/byte-efficiency/uses-webp-images.js | description": [
         "audits[uses-webp-images].description"
       ],
+      "lighthouse-core/lib/i18n/i18n.js | columnResourceSize": [
+        "audits[uses-webp-images].details.headings[2].label"
+      ],
       "lighthouse-core/audits/byte-efficiency/uses-optimized-images.js | title": [
         "audits[uses-optimized-images].title"
       ],
@@ -6814,6 +6813,9 @@
       "lighthouse-core/audits/seo/tap-targets.js | tapTargetHeader": [
         "audits[tap-targets].details.headings[0].text"
       ],
+      "lighthouse-core/lib/i18n/i18n.js | columnSize": [
+        "audits[tap-targets].details.headings[1].text"
+      ],
       "lighthouse-core/audits/seo/tap-targets.js | overlappingTargetHeader": [
         "audits[tap-targets].details.headings[2].text"
       ],

diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
@@ -2438,7 +2438,7 @@
                     },
                     {
                         "key": "totalBytes",
-                        "label": "Size",
+                        "label": "Transfer Size",
                         "valueType": "bytes"
                     },
                     {
@@ -2791,7 +2791,7 @@
                         "granularity": 1.0,
                         "itemType": "bytes",
                         "key": "transferSize",
-                        "text": "Size"
+                        "text": "Transfer Size"
                     },
                     {
                         "granularity": 1.0,
@@ -2921,7 +2921,7 @@
                     {
                         "itemType": "bytes",
                         "key": "totalBytes",
-                        "text": "Size"
+                        "text": "Transfer Size"
                     }
                 ],
                 "items": [
@@ -3003,7 +3003,7 @@
                     },
                     {
                         "key": "totalBytes",
-                        "label": "Size",
+                        "label": "Transfer Size",
                         "valueType": "bytes"
                     },
                     {
@@ -3189,7 +3189,7 @@
                         "granularity": 1.0,
                         "itemType": "bytes",
                         "key": "totalBytes",
-                        "text": "Size"
+                        "text": "Transfer Size"
                     }
                 ],
                 "items": [
@@ -3389,7 +3389,7 @@
                     },
                     {
                         "key": "totalBytes",
-                        "label": "Size",
+                        "label": "Transfer Size",
                         "valueType": "bytes"
                     },
                     {
@@ -3437,7 +3437,7 @@
                     },
                     {
                         "key": "totalBytes",
-                        "label": "Size",
+                        "label": "Resource Size",
                         "valueType": "bytes"
                     },
                     {