fix standard reruns

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1

@@ -14,9 +14,9 @@ function Push-CIPPStandard {
     Write-Information "We'll be running $FunctionName"
 
     if ($Standard -in @('IntuneTemplate', 'ConditionalAccessTemplate')) {
-        $API = "$Standard_$($Item.templateId)_$($Item.Settings.TemplateList.value)"
+        $API = "$($Standard)_$($Item.templateId)_$($Item.Settings.TemplateList.value)"
     } else {
-        $API = "$Standard_$($Item.templateId)"
+        $API = "$($Standard)_$($Item.templateId)"
     }
 
     $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API

Modules/CIPPCore/Public/Test-CIPPRerun.ps1

@@ -19,10 +19,11 @@ function Test-CIPPRerun {
     $EstimatedNextRun = $CurrentUnixTime + $EstimatedDifference
 
     try {
-        $RerunData = Get-CIPPAzDataTableEntity @RerunTable -filter "PartitionKey eq '$($TenantFilter)' and RowKey eq '$($Type)_$($API)'"
+        $RerunData = Get-CIPPAzDataTableEntity @RerunTable -filter "PartitionKey eq '$($TenantFilter)'" | Where-Object { $_.RowKey -match "^$($Type)_$($API)" }
         if ($ClearAll.IsPresent) {
             $AllRerunData = Get-CIPPAzDataTableEntity @RerunTable
             if ($AllRerunData) {
+                Write-Information "Clearing all rerun cache entries for $($Type)_$($API)"
                 Remove-AzDataTableEntity @RerunTable -Entity $AllRerunData -Force
             }
             return $false