Work so far

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecUpdateDriftDeviation.ps1

@@ -38,6 +38,21 @@ function Invoke-ExecUpdateDriftDeviation {
                         result  = $Result
                     }
                     Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Updated drift deviation status for $($Deviation.standardName) to $($Deviation.status)" -Sev 'Info'
+                    if ($Deviation.status -eq 'DeniedRemediate') {
+                        $Setting = $Deviation.standardName -replace 'standards.', ''
+                        $StandardTemplate = Get-CIPPTenantAlignment -TenantFilter $TenantFilter | Where-Object -Property standardType -EQ 'drift'
+                        $StandardTemplate = $StandardTemplate.$Setting
+                        $StandardTemplate.action = @(
+                            @{label = 'Report'; value = 'Report' },
+                            @{ label = 'Remediate'; value = 'Remediate' }
+                        )
+                        #idea here is to make a system job that triggers the remediation process, so that users can click on "Deniedremediate"
+                        #That job then launches a single standard run, it gets the same input as an orch, but is just a scheduled job.
+
+                    }
+                    if ($Deviation.status -eq 'deniedDelete') {
+                        #Here we look at the policy ID received and the type, and nuke it.
+                    }
                 } catch {
                     [PSCustomObject]@{
                         standardName = $Deviation.standardName

Modules/CIPPCore/Public/Get-CIPPDrift.ps1

@@ -188,22 +188,6 @@ function Get-CIPPDrift {
                     $TenantCAPolicies = @()
                 }
 
-                # Always update cache with fresh data
-                try {
-                    $CacheTable = Get-CippTable -tablename 'cacheDrift'
-                    $IntuneJsonString = "`"$($TenantIntunePolicies | ConvertTo-Json -Depth 10 -Compress | ForEach-Object { $_ -replace '"', '\"' })`""
-                    $CAJsonString = "`"$($TenantCAPolicies | ConvertTo-Json -Depth 10 -Compress | ForEach-Object { $_ -replace '"', '\"' })`""
-
-                    $CacheEntity = @{
-                        PartitionKey = 'drift'
-                        RowKey       = $TenantFilter
-                        IntuneJson   = $IntuneJsonString
-                        CAJson       = $CAJsonString
-                    }
-                    Add-CIPPAzDataTableEntity @CacheTable -Entity $CacheEntity -Force
-                } catch {
-                    Write-Warning "Failed to cache policy data: $($_.Exception.Message)"
-                }
             }
 
             if ($Alignment.standardSettings) {

Modules/CIPPCore/Public/Set-CIPPDriftDeviation.ps1

@@ -27,7 +27,7 @@ function Set-CIPPDriftDeviation {
         [string]$StandardName,
 
         [Parameter(Mandatory = $true)]
-        [ValidateSet('Accepted', 'New', 'Denied', 'CustomerSpecific')]
+        [ValidateSet('Accepted', 'New', 'Denied', 'CustomerSpecific', 'DeniedRemediate', 'DeniedDelete')]
         [string]$Status
     )