Merge pull request KelvinTegelaar#1610 from kris6673/brainfart

Feat: Enhance Autopilot Status Page standard with new options and compatibility improvements

Author: KelvinTegelaar

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1

@@ -15,14 +15,16 @@ function Invoke-CIPPStandardAutopilotStatusPage {
         TAG
         DISABLEDFEATURES
             {"report":false,"warn":false,"remediate":false}
+        EXECUTIVETEXT
+            Provides employees with a visual progress indicator during automated device setup, improving the user experience when receiving new computers. This reduces IT support calls and helps ensure successful device deployment by guiding users through the setup process.
         ADDEDCOMPONENT
             {"type":"number","name":"standards.AutopilotStatusPage.TimeOutInMinutes","label":"Timeout in minutes","defaultValue":60}
             {"type":"textField","name":"standards.AutopilotStatusPage.ErrorMessage","label":"Custom Error Message","required":false}
             {"type":"switch","name":"standards.AutopilotStatusPage.ShowProgress","label":"Show progress to users","defaultValue":true}
             {"type":"switch","name":"standards.AutopilotStatusPage.EnableLog","label":"Turn on log collection","defaultValue":true}
             {"type":"switch","name":"standards.AutopilotStatusPage.OBEEOnly","label":"Show status page only with OOBE setup","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotStatusPage.InstallWindowsUpdates","label":"Install Windows Updates during setup","defaultValue":true}
             {"type":"switch","name":"standards.AutopilotStatusPage.BlockDevice","label":"Block device usage during setup","defaultValue":true}
-            {"type":"switch","name":"standards.AutopilotStatusPage.AllowRetry","label":"Allow retry","defaultValue":true}
             {"type":"switch","name":"standards.AutopilotStatusPage.AllowReset","label":"Allow reset","defaultValue":true}
             {"type":"switch","name":"standards.AutopilotStatusPage.AllowFail","label":"Allow users to use device if setup fails","defaultValue":true}
         IMPACT
@@ -46,14 +48,18 @@ function Invoke-CIPPStandardAutopilotStatusPage {
     } #we're done.
     try {
         $CurrentConfig = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/deviceEnrollmentConfigurations?`$expand=assignments&orderBy=priority&`$filter=deviceEnrollmentConfigurationType eq 'windows10EnrollmentCompletionPageConfiguration' and priority eq 0" -tenantid $Tenant |
-        Select-Object -Property id, displayName, priority, showInstallationProgress, blockDeviceSetupRetryByUser, allowDeviceResetOnInstallFailure, allowLogCollectionOnInstallFailure, customErrorMessage, installProgressTimeoutInMinutes, allowDeviceUseOnInstallFailure, trackInstallProgressForAutopilotOnly
+            Select-Object -Property id, displayName, priority, showInstallationProgress, blockDeviceSetupRetryByUser, allowDeviceResetOnInstallFailure, allowLogCollectionOnInstallFailure, customErrorMessage, installProgressTimeoutInMinutes, allowDeviceUseOnInstallFailure, trackInstallProgressForAutopilotOnly, installQualityUpdates
+
+        # Compatibility for standards made in v8.3.0 or before, which did not have the InstallWindowsUpdates setting
+        $InstallWindowsUpdates = $Settings.InstallWindowsUpdates ?? $false
 
         $StateIsCorrect = ($CurrentConfig.installProgressTimeoutInMinutes -eq $Settings.TimeOutInMinutes) -and
         ($CurrentConfig.customErrorMessage -eq $Settings.ErrorMessage) -and
         ($CurrentConfig.showInstallationProgress -eq $Settings.ShowProgress) -and
         ($CurrentConfig.allowLogCollectionOnInstallFailure -eq $Settings.EnableLog) -and
         ($CurrentConfig.trackInstallProgressForAutopilotOnly -eq $Settings.OBEEOnly) -and
         ($CurrentConfig.blockDeviceSetupRetryByUser -eq !$Settings.BlockDevice) -and
+        ($CurrentConfig.installQualityUpdates -eq $InstallWindowsUpdates) -and
         ($CurrentConfig.allowDeviceResetOnInstallFailure -eq $Settings.AllowReset) -and
         ($CurrentConfig.allowDeviceUseOnInstallFailure -eq $Settings.AllowFail)
     } catch {
@@ -66,15 +72,16 @@ function Invoke-CIPPStandardAutopilotStatusPage {
     if ($Settings.remediate -eq $true) {
         try {
             $Parameters = @{
-                TenantFilter     = $Tenant
-                ShowProgress     = $Settings.ShowProgress
-                BlockDevice      = $Settings.BlockDevice
-                AllowReset       = $Settings.AllowReset
-                EnableLog        = $Settings.EnableLog
-                ErrorMessage     = $Settings.ErrorMessage
-                TimeOutInMinutes = $Settings.TimeOutInMinutes
-                AllowFail        = $Settings.AllowFail
-                OBEEOnly         = $Settings.OBEEOnly
+                TenantFilter          = $Tenant
+                ShowProgress          = $Settings.ShowProgress
+                BlockDevice           = $Settings.BlockDevice
+                InstallWindowsUpdates = $InstallWindowsUpdates
+                AllowReset            = $Settings.AllowReset
+                EnableLog             = $Settings.EnableLog
+                ErrorMessage          = $Settings.ErrorMessage
+                TimeOutInMinutes      = $Settings.TimeOutInMinutes
+                AllowFail             = $Settings.AllowFail
+                OBEEOnly              = $Settings.OBEEOnly
             }
 
             Set-CIPPDefaultAPEnrollment @Parameters