Sort both tenant groups and tenants in a group

Author: Zacgoose

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ListTenantGroups.ps1

@@ -12,8 +12,7 @@ function Invoke-ListTenantGroups {
 
     $groupFilter = $Request.Query.groupId ?? $Request.Body.groupId
     $TenantGroups = (Get-TenantGroups -GroupId $groupFilter) ?? @()
-    $SortedTenantGroups = $TenantGroups | Sort-Object Name
-    $Body = @{ Results = @($SortedTenantGroups) }
+    $Body = @{ Results = @($TenantGroups) }
 
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK

Modules/CIPPCore/Public/Functions/Get-TenantGroups.ps1

@@ -43,18 +43,21 @@ function Get-TenantGroups {
     }
 
     if ($TenantFilter -and $TenantFilter -ne 'allTenants') {
+        $Results = @()
         $Memberships = $AllMembers | Where-Object { $_.customerId -eq $Tenants.customerId }
         foreach ($Group in $Memberships) {
             $Group = $Groups | Where-Object { $_.RowKey -eq $Group.GroupId }
             if ($Group) {
-                [PSCustomObject]@{
+                $Results += [PSCustomObject]@{
                     Id          = $Group.RowKey
                     Name        = $Group.Name
                     Description = $Group.Description
                 }
             }
         }
+        return $Results | Sort-Object Name
     } else {
+        $Results = @()
         $Groups | ForEach-Object {
             $Group = $_
             $Members = $AllMembers | Where-Object { $_.GroupId -eq $Group.RowKey }
@@ -75,14 +78,16 @@ function Get-TenantGroups {
             }
             if (!$Members) {
                 $Members = @()
+            } else {
+                $Members = $Members | Sort-Object displayName
             }
-
-            [PSCustomObject]@{
+            $Results += [PSCustomObject]@{
                 Id          = $Group.RowKey
                 Name        = $Group.Name
                 Description = $Group.Description
                 Members     = @($Members)
             }
         }
+        return $Results | Sort-Object Name
     }
 }