Merge pull request KelvinTegelaar#1905 from Zacgoose/list-intune-by-tag

Fix: Optimise List Intune Templates by Tag

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-ListIntuneTemplates.ps1

@@ -51,14 +51,16 @@ function Invoke-ListIntuneTemplates {
     } else {
         if ($Request.query.mode -eq 'Tag') {
             #when the mode is tag, show all the potential tags, return the object with: label: tag, value: tag, count: number of templates with that tag, unique only
-            $Templates = $RawTemplates | Where-Object { $_.Package } | Select-Object -Property Package | ForEach-Object {
-                $package = $_.Package
+            $Templates = @($RawTemplates | Where-Object { $_.Package } | Group-Object -Property Package | ForEach-Object {
+                $package = $_.Name
+                $packageTemplates = @($_.Group)
+                $templateCount = $packageTemplates.Count
                 [pscustomobject]@{
-                    label         = "$($package) ($(($RawTemplates | Where-Object { $_.Package -eq $package }).Count) Templates)"
+                    label         = "$($package) ($templateCount Templates)"
                     value         = $package
                     type          = 'tag'
-                    templateCount = ($RawTemplates | Where-Object { $_.Package -eq $package }).Count
-                    templates     = @($RawTemplates | Where-Object { $_.Package -eq $package } | ForEach-Object {
+                    templateCount = $templateCount
+                    templates     = @($packageTemplates | ForEach-Object {
                             try {
                                 $JSONData = $_.JSON | ConvertFrom-Json -Depth 100 -ErrorAction SilentlyContinue
                                 $data = $JSONData.RAWJson | ConvertFrom-Json -Depth 100 -ErrorAction SilentlyContinue
@@ -76,7 +78,7 @@ function Invoke-ListIntuneTemplates {
                             }
                         })
                 }
-            } | Sort-Object -Property label -Unique
+            } | Sort-Object -Property label)
         } else {
             $Templates = $RawTemplates.JSON | ForEach-Object { try { ConvertFrom-Json -InputObject $_ -Depth 100 -ErrorAction SilentlyContinue } catch {} }