Merge pull request #5728 from sbwalker/dev

fix #5714 - order Profile properties by Category and then ViewOrder

Oqtane.Client/Services/ProfileService.cs

@@ -60,7 +60,7 @@ namespace Oqtane.Services
         public async Task<List<Profile>> GetProfilesAsync(int siteId)
         {
             List<Profile> profiles = await GetJsonAsync<List<Profile>>($"{Apiurl}?siteid={siteId}");
-            return profiles.OrderBy(item => item.ViewOrder).ToList();
+            return profiles.OrderBy(item => item.Category).ThenBy(item => item.ViewOrder).ToList();
         }
 
         public async Task<Profile> GetProfileAsync(int profileId)