Merge pull request #173 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/New-CIPPAlertTemplate.ps1

@@ -21,7 +21,15 @@ function New-CIPPAlertTemplate {
     $RuleTable = ''
     $Table = ''
     $LocationInfo = $LocationInfo ?? $Data.CIPPLocationInfo | ConvertFrom-Json -ErrorAction SilentlyContinue | Select-Object * -ExcludeProperty Etag, PartitionKey, TimeStamp
+    if ($Data -is [string]) {
+        $Data = @{ message = $Data }
+    }
+    if ($Data -is [array] -and $Data[0] -is [string]) {
+        $Data = $Data | ForEach-Object { @{ message = $_ } }
+    }
     if ($InputObject -eq 'table') {
+        #data can be a array of strings or a string, if it is, we need to convert it to an object so it shows up nicely, that object will have one header: message.
+
         $DataHTML = ($Data | Select-Object * -ExcludeProperty Etag, PartitionKey, TimeStamp | ConvertTo-Html | Out-String).Replace('<table>', ' <table class="table-modern">')
         $IntroText = "<p>You've configured CIPP to send you alerts based on the logbook. The following alerts match your configured rules</p>$dataHTML"
         $ButtonUrl = "$CIPPURL/cipp/logs"

Modules/CippExtensions/Public/Extension Functions/Register-CippExtensionScheduledTasks.ps1

@@ -23,7 +23,7 @@ function Register-CIPPExtensionScheduledTasks {
                 $CustomDataMappingTable = Get-CIPPTable -TableName CustomDataMappings
                 $Mappings = Get-CIPPAzDataTableEntity @CustomDataMappingTable | ForEach-Object {
                     $Mapping = $_.JSON | ConvertFrom-Json
-                    if ($Mapping.sourceType -eq 'extensionSync') {
+                    if ($Mapping.sourceType.value -eq 'extensionSync') {
                         $TenantMappings = if ($Mapping.tenantFilter.value -contains 'AllTenants') {
                             $Tenants
                         } else {