Implemented proper sorting capabilities

Author: Licantrop0

MsGraphSamples.Services/ExtensionMethods.cs

@@ -6,6 +6,7 @@ namespace MsGraphSamples;
 public static class ExtensionMethods
 {
     public static bool In(this string s, params string[] items) => items.Any(i => i.Trim().Equals(s, StringComparison.InvariantCultureIgnoreCase));
+    public static bool IsNullOrEmpty(this string? s) => string.IsNullOrEmpty(s);
 
     public static int NthIndexOf(this string input, char value, int nth, int startIndex = 0)
     {

MsGraphSamples.Services/GraphDataService.cs

@@ -70,7 +70,6 @@ public class GraphDataService(GraphServiceClient graphClient) : IGraphDataServic
         return collectionResponse.GetNextPageAsync(_graphClient.RequestAdapter);
     }
 
-
     public Task<ApplicationCollectionResponse?> GetApplicationCollectionAsync(string[] select, string? filter = null, string[]? orderBy = null, string? search = null, ushort top = 999)
     {
         var requestInfo = _graphClient.Applications
@@ -207,6 +206,7 @@ public class GraphDataService(GraphServiceClient graphClient) : IGraphDataServic
         LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
         return _graphClient.RequestAdapter.SendAsync(requestInfo, UserCollectionResponse.CreateFromDiscriminatorValue);
     }
+
     public Task<UserCollectionResponse?> GetGroupOwnersAsUserCollectionAsync(string id, string[] select, ushort top = 999)
     {
         var requestInfo = _graphClient.Groups[id]
@@ -223,7 +223,6 @@ public class GraphDataService(GraphServiceClient graphClient) : IGraphDataServic
         return _graphClient.RequestAdapter.SendAsync(requestInfo, UserCollectionResponse.CreateFromDiscriminatorValue);
     }
 
-
     public Task<GroupCollectionResponse?> GetTransitiveMemberOfAsGroupCollectionAsync(string id, string[] select, ushort top = 999)
     {
         var requestInfo = _graphClient.Users[id]
@@ -262,5 +261,4 @@ public Task WriteExtensionProperty(string propertyName, object propertyValue, st
         userRequestBody.AdditionalData[propertyName] = propertyValue;
         return _graphClient.Users[userId].PatchAsync(userRequestBody);
     }
-
 }

MsGraphSamples.WPF/Helpers/Converters.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using Microsoft.Graph.Models;
-using Microsoft.Kiota.Abstractions.Store;
 using System.Globalization;
 using System.Windows.Data;
 

MsGraphSamples.WPF/ViewModels/MainViewModel.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Net;
 using System.Text;
@@ -50,7 +51,7 @@ public partial class MainViewModel(IAuthService authService, IGraphDataService g
     public string _select = "id,displayName,mail,userPrincipalName";
 
     [ObservableProperty]
-    public string? _filter = string.Empty;
+    public string? _filter;
 
     public string[]? SplittedOrderBy => OrderBy?.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
 
@@ -101,7 +102,8 @@ public string? Search
 
     #endregion
 
-    public async Task Init()
+    [RelayCommand]
+    public async Task PageLoaded()
     {
         var user = await graphDataService.GetUserAsync(["displayName"]);
         UserName = user?.DisplayName;
@@ -131,9 +133,9 @@ private async Task DrillDown()
 
         await IsBusyWrapper(async () =>
         {
-            OrderBy = string.Empty;
-            Filter = string.Empty;
-            Search = string.Empty;
+            OrderBy = null;
+            Filter = null;
+            Search = null;
 
             return DirectoryObjects switch
             {
@@ -165,12 +167,12 @@ private Task LoadNextPage()
     }
 
     [RelayCommand]
-    private Task Sort(DataGridSortingEventArgs? e)
+    private Task Sort(DataGridSortingEventArgs e)
     {
-        ArgumentNullException.ThrowIfNull(e);
+        OrderBy = e.Column.SortDirection == null || e.Column.SortDirection == ListSortDirection.Descending
+            ? $"{e.Column.Header} asc"
+            : $"{e.Column.Header} desc";
 
-        OrderBy = (string)e.Column.Header;
-        e.Handled = true;
         return Load();
     }
 
@@ -200,7 +202,6 @@ private void Logout()
         App.Current.Shutdown();
     }
 
-
     private async Task IsBusyWrapper(Func<Task<BaseCollectionPaginationCountResponse?>> getDirectoryObjects)
     {
         IsBusy = true;

MsGraphSamples.WPF/Views/MainWindow.xaml

@@ -37,10 +37,13 @@
     d:DataContext="{d:DesignInstance Type=viewmodels:MainViewModel}"
     DataContext="{Binding MainVM, Source={StaticResource Locator}}"
     Icon="/Assets/MSGraph.png"
-    Initialized="Window_Initialized"
-    Loaded="Window_Loaded"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
+    <i:Interaction.Triggers>
+        <i:EventTrigger EventName="Loaded">
+            <i:InvokeCommandAction Command="{Binding PageLoadedCommand}" />
+        </i:EventTrigger>
+    </i:Interaction.Triggers>
 
     <Grid>
         <Grid.Resources>

MsGraphSamples.WPF/Views/MainWindow.xaml.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using MsGraphSamples.WPF.Helpers;
 using MsGraphSamples.WPF.ViewModels;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -50,6 +50,15 @@ private void ResultsDataGrid_AutoGeneratingColumn(object sender, DataGridAutoGen
         if (!e.Cancel)
         {
             e.Column.Width = new DataGridLength(1, DataGridLengthUnitType.Star);
+
+            var orderByProperty = ViewModel.OrderBy?.Split(' ')[0];
+            var direction = ViewModel.OrderBy?.Split(' ').ElementAtOrDefault(1) ?? "asc";
+            if (e.PropertyName.Equals(orderByProperty, StringComparison.InvariantCultureIgnoreCase))
+            {
+                e.Column.SortDirection = direction.Equals("asc", StringComparison.InvariantCultureIgnoreCase)
+                    ? ListSortDirection.Ascending
+                    : ListSortDirection.Descending;
+            }
         }
     }
 
@@ -63,14 +72,4 @@ private void ResultsDataGrid_AutoGeneratedColumns(object sender, System.EventArg
                 p => p.Equals(column.Header.ToString(), StringComparison.OrdinalIgnoreCase));
         }
     }
-
-    private void Window_Loaded(object sender, RoutedEventArgs e)
-    {
-        //Dispatcher.InvokeAsync(ViewModel.Init);
-    }
-
-    private void Window_Initialized(object sender, EventArgs e)
-    {
-        ViewModel.Init().Await();
-    }
 }

MsGraphSamples.WinUI/App.xaml.cs

@@ -51,6 +51,7 @@ private static ServiceProvider GetServices()
     protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         var m_window = new MainWindow();
+        m_window.ExtendsContentIntoTitleBar = true;
 
         // Create a Frame to act as the navigation context and navigate to the first page
         var rootFrame = new Frame();