Merge branch 'main' into dev

Author: merill

src/powershell/assets/ReportTemplate.html

@@ -430,10 +430,6 @@ function Invoke-ZtAssessment {
 
 	# Collect data
 	if ($Resume) {
-		if (-not (Test-Path $dbPath -PathType Leaf)) {
-			throw "Resume requested, but no existing database was found at '$dbPath'. Run without -Resume first, or restore the previous export/database."
-		}
-
 		# Guard: verify the requested pillar is compatible with the exported data
 		$exportedPillar = Get-ZtConfig -ExportPath $exportPath -Property Pillar
 		if ($exportedPillar -and $exportedPillar -ne $Pillar) {
@@ -444,15 +440,12 @@ function Invoke-ZtAssessment {
 				throw "Resume requested with -Pillar $Pillar, but the existing export was created with -Pillar $exportedPillar. Run without -Resume or use -Pillar $exportedPillar."
 			}
 		}
-
-		Write-PSFMessage -Message "Stage 1: Reusing Existing Export and Database" -Tag stage
-		$database = Connect-Database -Path $dbPath -Transient
-	}
-	else {
-		Write-PSFMessage -Message "Stage 1: Exporting Tenant Data" -Tag stage
-		Export-ZtTenantData -ExportPath $exportPath -Days $Days -MaximumSignInLogQueryTime $MaximumSignInLogQueryTime -Pillar $Pillar -ThrottleLimit $ExportThrottleLimit
-		$database = Export-Database -ExportPath $exportPath -Pillar $Pillar
 	}
+
+	Write-PSFMessage -Message "Stage 1: Exporting Tenant Data" -Tag stage
+	Export-ZtTenantData -ExportPath $exportPath -Days $Days -MaximumSignInLogQueryTime $MaximumSignInLogQueryTime -Pillar $Pillar -ThrottleLimit $ExportThrottleLimit
+	$database = Export-Database -ExportPath $exportPath -Pillar $Pillar
+
 	try {
 		# Run the tests
 		Write-PSFMessage -Message "Stage 2: Running Tests" -Tag stage

src/powershell/public/Invoke-ZtAssessment.ps1

@@ -14,7 +14,16 @@ export default function Data() {
                 <CardHeader>
                     <CardTitle className="mb-3">Assessment results</CardTitle>
                     <CardDescription>
-                        The results presented below are based on data protection principles.
+                        The results presented below are based on the security principles detailed in the{" "}
+                        <a
+                            href="https://learn.microsoft.com/en-us/purview/configure-security"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="text-primary font-medium underline underline-offset-4 hover:underline"
+                        >
+                            Configuring Microsoft Purview for increased security
+                        </a>
+                        {" "}guide.
                     </CardDescription>
                 </CardHeader>
                 <CardContent className="gap-4 px-4 pb-4 pt-1">

src/report/src/pages/Data.tsx

@@ -14,7 +14,16 @@ export default function Network() {
                 <CardHeader>
                     <CardTitle className="mb-3">Assessment results</CardTitle>
                     <CardDescription>
-                        The results presented below are based on network security principles.
+                        The results presented below are based on the security principles detailed in the{" "}
+                        <a
+                            href="https://learn.microsoft.com/en-us/entra/fundamentals/configure-security"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="text-primary font-medium underline underline-offset-4 hover:underline"
+                        >
+                            Configuring Microsoft Entra and Azure for increased security
+                        </a>
+                        {" "}guide.
                     </CardDescription>
                 </CardHeader>
                 <CardContent className="gap-4 px-4 pb-4 pt-1">