Resolve post rebase artifacts

GoogleChrome · Jan 18, 2023 · 715a728 · 715a728
1 parent 8cf66c8
commit 715a728
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/core/lib/entity-classification.js b/core/lib/entity-classification.js
@@ -24,6 +24,7 @@ async function getEntityClassification(artifacts, context) {
     const shortEntity = {
       name: entity.name,
       homepage: entity.homepage,
+      category: entity.category,
     };
 
     // Reduce payload size in LHR JSON by omitting whats falsy.

diff --git a/core/test/fixtures/fraggle-rock/reports/sample-flow-result.json b/core/test/fixtures/fraggle-rock/reports/sample-flow-result.json
@@ -1676,7 +1676,8 @@
                   "key": "startTime",
                   "valueType": "ms",
                   "granularity": 1,
-                  "label": "Start Time"
+                  "label": "Start Time",
+                  "dontAggregate": true
                 },
                 {
                   "key": "duration",
@@ -8705,7 +8706,8 @@
                   "key": "startTime",
                   "valueType": "ms",
                   "granularity": 1,
-                  "label": "Start Time"
+                  "label": "Start Time",
+                  "dontAggregate": true
                 },
                 {
                   "key": "duration",
@@ -8845,7 +8847,8 @@
                   "key": "cacheLifetimeMs",
                   "valueType": "ms",
                   "label": "Cache TTL",
-                  "displayUnit": "duration"
+                  "displayUnit": "duration",
+                  "dontAggregate": true
                 },
                 {
                   "key": "totalBytes",
@@ -17335,7 +17338,8 @@
                   "key": "startTime",
                   "valueType": "ms",
                   "granularity": 1,
-                  "label": "Start Time"
+                  "label": "Start Time",
+                  "dontAggregate": true
                 },
                 {
                   "key": "duration",

diff --git a/core/test/results/sample_v2.json b/core/test/results/sample_v2.json
@@ -2396,7 +2396,8 @@
             "key": "startTime",
             "valueType": "ms",
             "granularity": 1,
-            "label": "Start Time"
+            "label": "Start Time",
+            "dontAggregate": true
           },
           {
             "key": "duration",
@@ -3675,7 +3676,8 @@
             "key": "cacheLifetimeMs",
             "valueType": "ms",
             "label": "Cache TTL",
-            "displayUnit": "duration"
+            "displayUnit": "duration",
+            "dontAggregate": true
           },
           {
             "key": "totalBytes",

diff --git a/report/renderer/components.js b/report/renderer/components.js
diff --git a/report/renderer/details-renderer.js b/report/renderer/details-renderer.js
@@ -35,8 +35,8 @@ export class DetailsRenderer {
   /**
    * @param {DOM} dom
    * @param {{
-   *  fullPageScreenshot?: LH.Audit.Details.FullPageScreenshot,
-   *  entityClassification?: LH.Audit.Details.EntityClassification,
+   *  fullPageScreenshot?: LH.Result.FullPageScreenshot,
+   *  entityClassification?: LH.Result.EntityClassification,
    * }} [options]
    */
   constructor(dom, options = {}) {
@@ -389,7 +389,12 @@ export class DetailsRenderer {
     renderedRows[0]?.classList.add('lh-row--group');
 
     const entityName = group.entity?.toString() || '';
-    const matchedEntity = this._entityClassification?.entities[entityName];
+    const entityIndex = this._entityClassification?.nameLUT[entityName];
+    /** @type {LH.Result.Entity|undefined} */
+    let matchedEntity;
+    if (typeof entityIndex !== 'undefined') {
+      matchedEntity = this._entityClassification?.entities[entityIndex];
+    }
 
     if (matchedEntity?.category) {
       const categoryChipEl = this._dom.createElement('span');