From 48cf903f372ea9ccf120eed45c8fd173dad4e136 Mon Sep 17 00:00:00 2001 From: Ashwin Gokhale Date: Tue, 20 Feb 2024 13:25:36 -0800 Subject: [PATCH 1/2] Added null handling in scanner.ts --- packages/shared/src/scanner/scanner.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/shared/src/scanner/scanner.ts b/packages/shared/src/scanner/scanner.ts index b7491e7ec..bb8a349a2 100644 --- a/packages/shared/src/scanner/scanner.ts +++ b/packages/shared/src/scanner/scanner.ts @@ -174,15 +174,15 @@ export class Scanner { scanEnded: Date, ): CombinedReportParameters { const scanResultData = { - baseUrl: combinedScanResult.scanMetadata.baseUrl ?? 'n/a', - basePageTitle: combinedScanResult.scanMetadata.basePageTitle, + baseUrl: combinedScanResult?.scanMetadata?.baseUrl ?? 'n/a', + basePageTitle: combinedScanResult?.scanMetadata?.basePageTitle ?? 'n/a', scanEngineName: toolName, axeCoreVersion: this.axeInfo.version, - browserUserAgent: combinedScanResult.scanMetadata.userAgent, - urlCount: combinedScanResult.urlCount, + browserUserAgent: combinedScanResult?.scanMetadata?.userAgent ?? 'n/a', + urlCount: combinedScanResult?.urlCount ?? 0, scanStarted, scanEnded, - browserResolution: combinedScanResult.scanMetadata.browserResolution, + browserResolution: combinedScanResult?.scanMetadata?.browserResolution? ?? 'n/a', }; return this.combinedReportDataConverter.convertCrawlingResults(combinedScanResult.combinedAxeResults, scanResultData); From 78a4c1fd0866a1d2d83bf8d304b0ab62d239648b Mon Sep 17 00:00:00 2001 From: Ashwin Gokhale Date: Tue, 20 Feb 2024 23:58:33 +0000 Subject: [PATCH 2/2] Fix formatting --- packages/shared/src/scanner/scanner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared/src/scanner/scanner.ts b/packages/shared/src/scanner/scanner.ts index bb8a349a2..486567e6e 100644 --- a/packages/shared/src/scanner/scanner.ts +++ b/packages/shared/src/scanner/scanner.ts @@ -179,10 +179,10 @@ export class Scanner { scanEngineName: toolName, axeCoreVersion: this.axeInfo.version, browserUserAgent: combinedScanResult?.scanMetadata?.userAgent ?? 'n/a', - urlCount: combinedScanResult?.urlCount ?? 0, + urlCount: combinedScanResult.urlCount, scanStarted, scanEnded, - browserResolution: combinedScanResult?.scanMetadata?.browserResolution? ?? 'n/a', + browserResolution: combinedScanResult?.scanMetadata?.browserResolution ?? 'n/a', }; return this.combinedReportDataConverter.convertCrawlingResults(combinedScanResult.combinedAxeResults, scanResultData);