Skip to content

Commit cce7462

Browse files
authored
Merge pull request #639 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 3116d49 + 8a86ddb commit cce7462

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

ExampleReportTemplate.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
$Table = Get-CippTable -tablename 'CippReportTemplates'
2+
3+
$Entity = @{
4+
RowKey = (New-Guid).ToString()
5+
PartitionKey = 'ReportingTemplate'
6+
Tests = [string](@('Test01', 'Test02', 'Test03', 'Test04', 'Test05') | ConvertTo-Json -Compress)
7+
Description = 'This is a test report'
8+
Name = 'Test Report'
9+
}
10+
11+
Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force
12+
13+
Write-Host "Report template created successfully with ID: $($Entity.RowKey)"

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,31 @@ function Invoke-ListTests {
2525

2626
$TestResultsData = Get-CIPPTestResults -TenantFilter $TenantFilter
2727

28+
$TotalTests = 0
29+
2830
if ($ReportId) {
29-
$ReportTable = Get-CippTable -tablename 'CippReportingTemplates'
31+
$ReportTable = Get-CippTable -tablename 'CippReportTemplates'
3032
$Filter = "PartitionKey eq 'ReportingTemplate' and RowKey eq '{0}'" -f $ReportId
3133
$ReportTemplate = Get-CIPPAzDataTableEntity @ReportTable -Filter $Filter
3234

3335
if ($ReportTemplate) {
3436
$ReportTests = $ReportTemplate.Tests | ConvertFrom-Json
37+
$TotalTests = @($ReportTests).Count
3538
$FilteredTests = $TestResultsData.TestResults | Where-Object { $ReportTests -contains $_.TestId }
3639
$TestResultsData.TestResults = $FilteredTests
3740
} else {
3841
Write-LogMessage -API $APIName -tenant $TenantFilter -message "Report template '$ReportId' not found" -sev Warning
3942
$TestResultsData.TestResults = @()
4043
}
44+
} else {
45+
$TotalTests = @($TestResultsData.TestResults).Count
4146
}
4247

4348
$TestCounts = @{
4449
Successful = @($TestResultsData.TestResults | Where-Object { $_.Result -eq 'Passed' }).Count
4550
Failed = @($TestResultsData.TestResults | Where-Object { $_.Result -eq 'Failed' }).Count
4651
Skipped = @($TestResultsData.TestResults | Where-Object { $_.Result -eq 'Skipped' }).Count
47-
Total = @($TestResultsData.TestResults).Count
52+
Total = $TotalTests
4853
}
4954

5055
$TestResultsData | Add-Member -NotePropertyName 'TestCounts' -NotePropertyValue $TestCounts -Force

0 commit comments

Comments
 (0)