Merge pull request #655 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Add-CIPPDbItem.ps1

@@ -42,6 +42,12 @@ function Add-CIPPDbItem {
 
     try {
         $Table = Get-CippTable -tablename 'CippReportingDB'
+        #Get the existing type entries and nuke them. This ensures we don't have stale data.
+        $Filter = "PartitionKey eq '{0}' and RowKey ge '{1}-' and RowKey lt '{1}0'" -f $TenantFilter, $Type
+        $ExistingEntities = Get-CIPPAzDataTableEntity @Table -Filter $Filter
+        if ($ExistingEntities) {
+            Remove-AzDataTableEntity @Table -Entity $ExistingEntities -Force | Out-Null
+        }
 
         if ($Count) {
             $Entity = @{
@@ -54,7 +60,7 @@ function Add-CIPPDbItem {
 
         } else {
             $Entities = foreach ($Item in $Data) {
-                $ItemId = $Item.id
+                $ItemId = $Item.id ? $Item.id : $item.skuId
                 @{
                     PartitionKey = $TenantFilter
                     RowKey       = "$Type-$ItemId"

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListAvailableTests.ps1

@@ -73,7 +73,6 @@ function Invoke-ListAvailableTests {
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -user $Request.Headers.'x-ms-client-principal' -API $APIName -message "Failed to list available tests: $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
         $Body = [PSCustomObject]@{
             Results = "Failed to list available tests: $($ErrorMessage.NormalizedError)"
         }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListTests.ps1

@@ -121,6 +121,11 @@ function Invoke-ListTests {
             $TestResultsData | Add-Member -NotePropertyName 'MFAState' -NotePropertyValue $MFAStateData -Force
         }
 
+        $LicenseData = New-CIPPDbRequest -TenantFilter $TenantFilter -Type 'LicenseOverview'
+        if ($LicenseData) {
+            $TestResultsData | Add-Member -NotePropertyName 'LicenseData' -NotePropertyValue @($LicenseData) -Force
+        }
+
         $StatusCode = [HttpStatusCode]::OK
         $Body = $TestResultsData
 

Modules/CIPPCore/Public/Get-CIPPDbItem.ps1

@@ -55,3 +55,4 @@ function Get-CIPPDbItem {
         throw
     }
 }
+