Merge pull request #3640 from SwiftPackageIndex/canonical-debug-panel

daveverwer · web-flow · commit 5ccd4b202d54 · 2025-01-28T18:26:25.000Z
Cope with pages that have no canonical in the JS debug panel
diff --git a/FrontEnd/scripts/debug_panel.js b/FrontEnd/scripts/debug_panel.js
@@ -76,11 +76,11 @@ export class SPIDebugPanel extends HTMLElement {
     }
 
     addCanonicalUrls() {
-        const canonicalUrl = document.querySelector('link[rel="canonical"]').href
+        const canonicalUrl = document.querySelector('link[rel="canonical"]')?.href
         const windowUrl = window.location.href
         const matchingCanonicalUrl = canonicalUrl === windowUrl
 
-        this.newTableRow('Canonical URL', canonicalUrl)
+        this.newTableRow('Canonical URL', canonicalUrl ? canonicalUrl : 'Missing', canonicalUrl ? null : 'red')
         this.newTableRow('Window URL', windowUrl)
         this.newTableRow('Canonical Match', matchingCanonicalUrl, matchingCanonicalUrl ? 'green' : 'red')
     }

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ export class SPIDebugPanel extends HTMLElement {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`addCanonicalUrls() {`
`79`		`- const canonicalUrl = document.querySelector('link[rel="canonical"]').href`
	`79`	`+ const canonicalUrl = document.querySelector('link[rel="canonical"]')?.href`
`80`	`80`	`const windowUrl = window.location.href`
`81`	`81`	`const matchingCanonicalUrl = canonicalUrl === windowUrl`
`82`	`82`
`83`		`- this.newTableRow('Canonical URL', canonicalUrl)`
	`83`	`+ this.newTableRow('Canonical URL', canonicalUrl ? canonicalUrl : 'Missing', canonicalUrl ? null : 'red')`
`84`	`84`	`this.newTableRow('Window URL', windowUrl)`
`85`	`85`	`this.newTableRow('Canonical Match', matchingCanonicalUrl, matchingCanonicalUrl ? 'green' : 'red')`
`86`	`86`	`}`