domain analyser fixes

KelvinTegelaar · Oct 18, 2024 · 0d617ff · 0d617ff
1 parent 9483db2
commit 0d617ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListBPA.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListBPA.ps1
@@ -80,13 +80,19 @@ Function Invoke-ListBPA {
     $Results = [PSCustomObject]@{
         Data    = @($Data)
         Columns = @($Columns)
+        Keys    = $Data | ForEach-Object {
+            $_.PSObject.Properties |
+            Where-Object { $_.Name -ne 'PartitionKey' -and $_.Name -ne 'RowKey' -and $_.Name -ne 'Timestamp' } |
+            ForEach-Object { $_.Name }
+        } | Select-Object -Unique
         Style   = $Style
     }
 
     if (!$Results) {
         $Results = @{
             Columns = @( value = 'Results'; name = 'Results')
             Data    = @(@{ Results = 'The BPA has not yet run.' })
+            Keys    = @()
         }
     }
 

diff --git a/Modules/CIPPCore/Public/Get-CIPPDomainAnalyser.ps1 b/Modules/CIPPCore/Public/Get-CIPPDomainAnalyser.ps1
@@ -17,7 +17,8 @@ function Get-CIPPDomainAnalyser {
     $DomainTable = Get-CIPPTable -Table 'Domains'
 
     # Get all the things
-
+    #Transform the tenantFilter to the GUID.
+    $TenantFilter = (Get-Tenants -TenantFilter $tenantFilter).customerId
     if ($TenantFilter -ne 'AllTenants' -and ![string]::IsNullOrEmpty($TenantFilter)) {
         $DomainTable.Filter = "TenantGUID eq '{0}'" -f $TenantFilter
     }