Skip to content

Commit 4827d90

Browse files
committed
tweak scheduled task details and removal
1 parent 225350e commit 4827d90

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function Push-ExecScheduledCommand {
8989
Results = [string](ConvertTo-Json -Compress -Depth 20 $results)
9090
}
9191
$null = Add-AzDataTableEntity @TaskResultsTable -Entity $TaskResults -Force
92-
$StoredResults = @{ Results = 'Completed, click see details for more information' } | ConvertTo-Json -Compress
92+
$StoredResults = @{ Results = 'Completed, details are available in the More Info pane' } | ConvertTo-Json -Compress
9393
}
9494
} catch {
9595
$errorMessage = $_.Exception.Message

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-RemoveScheduledItem.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using namespace System.Net
22

3-
Function Invoke-RemoveScheduledItem {
3+
function Invoke-RemoveScheduledItem {
44
<#
55
.FUNCTIONALITY
66
Entrypoint,AnyTenant
@@ -13,13 +13,21 @@ Function Invoke-RemoveScheduledItem {
1313
$APIName = 'RemoveScheduledItem'
1414
$User = $Request.Headers
1515

16+
$RowKey = $Request.Query.id ? $Request.Query.id : $Request.Body.id
1617
$task = @{
17-
RowKey = $Request.Query.id ? $Request.Query.id : $Request.Body.id
18+
RowKey = $RowKey
1819
PartitionKey = 'ScheduledTask'
1920
}
2021
$Table = Get-CIPPTable -TableName 'ScheduledTasks'
2122
Remove-AzDataTableEntity -Force @Table -Entity $task
2223

24+
$DetailTable = Get-CIPPTable -TableName 'ScheduledTaskDetails'
25+
$Details = Get-CIPPAzDataTableEntity @DetailTable -Filter "PartitionKey eq '$($RowKey)'" -Property RowKey, PartitionKey, ETag
26+
27+
if ($Details) {
28+
Remove-AzDataTableEntity -Force @DetailTable -Entity $Details
29+
}
30+
2331
Write-LogMessage -Headers $User -API $APINAME -message "Task removed: $($task.RowKey)" -Sev 'Info'
2432

2533
Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{

0 commit comments

Comments
 (0)