Merge branch 'main' into import-flamegraph

Author: canova

package.json

@@ -70,7 +70,7 @@
     "@fluent/langneg": "^0.7.0",
     "@fluent/react": "^0.15.2",
     "@lezer/highlight": "^1.2.3",
-    "@tgwf/co2": "^0.16.9",
+    "@tgwf/co2": "^0.17.0",
     "array-move": "^3.0.1",
     "array-range": "^1.0.1",
     "clamp": "^1.0.1",

src/actions/app.ts

@@ -150,8 +150,12 @@ export function setupInitialUrlState(
       return;
     }
 
-    // Validate the initial URL state. We can't refresh on a from-file URL.
-    if (urlState.dataSource === 'from-file') {
+    // Validate the initial URL state. We can't refresh on from-file or
+    // unpublished URLs.
+    if (
+      urlState.dataSource === 'from-file' ||
+      urlState.dataSource === 'unpublished'
+    ) {
       urlState = null;
     }
 

src/actions/receive-profile.ts

@@ -1400,9 +1400,10 @@ export function retrieveProfileForRawUrl(
     }
 
     let dataSource = ensureIsValidDataSource(possibleDataSource);
-    if (dataSource === 'from-file') {
-      // Redirect to 'none' if `dataSource` is 'from-file' since initial urls can't
-      // be 'from-file' and needs to be redirected to home page.
+    // Redirect to 'none' for from-file and unpublished data sources since initial
+    // urls can't be 'from-file' or 'unpublished' and need to be redirected to
+    // home page. 'unpublished' is a transient state after profile deletion.
+    if (dataSource === 'from-file' || dataSource === 'unpublished') {
       dataSource = 'none';
     }
     dispatch(setDataSource(dataSource));
@@ -1475,7 +1476,6 @@ export function retrieveProfileForRawUrl(
       case 'uploaded-recordings':
       case 'none':
       case 'local':
-      case 'unpublished':
         // There is no profile to download for these datasources.
         break;
       default:

src/components/tooltip/NetworkMarker.tsx

@@ -308,6 +308,14 @@ export function getNetworkMarkerDetails(
     </TooltipDetail>
   );
 
+  if (payload.priorityHeader) {
+    details.push(
+      <TooltipDetail label="Priority Header" key="Network-Priority-Header">
+        {payload.priorityHeader}
+      </TooltipDetail>
+    );
+  }
+
   if (mimeType) {
     details.push(
       <TooltipDetail label={mimeTypeLabel} key={'Network-' + mimeTypeLabel}>

src/test/store/receive-profile.test.ts

@@ -2190,6 +2190,20 @@ describe('actions/receive-profile', function () {
         });
       }
     );
+
+    it('redirects unpublished initial URLs to home page', async function () {
+      const { getState } = await setup({
+        pathname: '/unpublished/',
+        search: '',
+        hash: '',
+      });
+
+      // The data source should be redirected from 'unpublished' to 'none'.
+      expect(UrlStateSelectors.getDataSource(getState())).toEqual('none');
+
+      // No profile should be loaded.
+      expect(ProfileViewSelectors.getProfileOrNull(getState())).toEqual(null);
+    });
   });
 });
 

src/types/markers.ts

@@ -500,6 +500,9 @@ export type NetworkPayload = {
   RedirectURI?: string;
   id: number;
   pri: number; // priority of the load; always included as it can change
+  // The Priority header value from the HTTP response.
+  // This property is optional because older versions of Gecko do not include it.
+  priorityHeader?: string;
   count?: number; // Total size of transfer, if any
   // See all possible values in tools/profiler/core/platform.cpp
   status: NetworkStatus;

yarn.lock

@@ -2031,10 +2031,10 @@
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-"@tgwf/co2@^0.16.9":
-  version "0.16.9"
-  resolved "https://registry.yarnpkg.com/@tgwf/co2/-/co2-0.16.9.tgz#629dfcc7bc3b5980047793932d9254b9b9578371"
-  integrity sha512-+nuT7HS5r22lbW4MdgSPHhirYBjHR6Q8sz5kX6dKdK+yIkRukLAGaH6L/toZwVEOuEeeIRfWYJuaJIoxEGDMXg==
+"@tgwf/co2@^0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@tgwf/co2/-/co2-0.17.0.tgz#e9034dce60d94725e791e53747b882d3b9fa729e"
+  integrity sha512-OGdIeI56TJtwC+CEPf6zg/n+urPRw/XP4YObYHRVgJKeubnxyFNfUHLUgsQMmGyrGYqTNXuQxX6/qrbT5aMFtw==
 
 "@tootallnate/once@2":
   version "2.0.0"