Merge pull request #1035 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Config/FeatureFlags.json

@@ -48,7 +48,7 @@
     "Id": "CopilotAI",
     "Name": "Copilot & AI",
     "Description": "Under Development: Microsoft 365 Copilot and AI management pages including settings, usage reports, Agent365 packages, and Shadow AI analysis.",
-    "Enabled": false,
+    "Enabled": true,
     "AllowUserToggle": false,
     "Timers": [],
     "Endpoints": [
@@ -67,7 +67,7 @@
       "/copilot/reports/copilot-usage",
       "/copilot/reports/copilot-trend"
     ],
-    "Hidden": true
+    "Hidden": false
   },
   {
     "Id": "MCPServer",
@@ -82,4 +82,4 @@
     "Pages": [],
     "Hidden": false
   }
-]
+]

Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableSelfServiceLicenses.ps1

@@ -81,6 +81,11 @@ function Invoke-CIPPStandardDisableSelfServiceLicenses {
                     policyValue = $AutoClaimPolicy.tenantPolicyValue ?? 'Disabled'
                 })
         } catch {
+            $CurrentValues.Add([PSCustomObject]@{
+                        productName = 'Trial Autoclaim'
+                        productId   = 'autoclaim'
+                        policyValue = 'Failed to retrieve current state, check the logs for details'
+                    })
             Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to retrieve trial autoclaim policy: $($_.Exception.Message)" -sev Error
         }
     }
@@ -181,6 +186,11 @@ function Invoke-CIPPStandardDisableSelfServiceLicenses {
                         policyValue = $AutoClaimPolicy.tenantPolicyValue ?? 'Disabled'
                     })
             } catch {
+                $CurrentValues.Add([PSCustomObject]@{
+                        productName = 'Trial Autoclaim'
+                        productId   = 'autoclaim'
+                        policyValue = 'Failed to retrieve current state, check the logs for details'
+                    })
                 Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to retrieve trial autoclaim policy after remediation: $($_.Exception.Message)" -sev Error
             }
         }