Refactor MainViewModel and update MainPage UI

Refactored MainViewModel to improve property change notifications:
- Added `[NotifyPropertyChangedFor]` attributes to relevant fields.
- Removed redundant `OnPropertyChanged` calls.
- Added `IsIndeterminate` property to reflect busy/error states.
- Modified exception handling to set `IsError` appropriately.

Updated MainPage.xaml to enhance UI bindings
- Enabled/disabled buttons based on `IsBusy` state.
- Re-enabled `Logout` button.
- Bound `ProgressBar` properties to `IsIndeterminate` and `IsError`.
- Added converter for DirectoryObjects.Value

Author: Licantrop0

MsGraphSamples.Services/GraphExtensions.cs

@@ -62,9 +62,9 @@ public static async IAsyncEnumerable<TEntity> ToAsyncEnumerable<TEntity, TCollec
         }
     }
 
-    public static List<TEntity> GetValue<TEntity>(this BaseCollectionPaginationCountResponse collectionResponse) where TEntity : Entity
+    public static List<TEntity> GetValue<TEntity>(this BaseCollectionPaginationCountResponse? collectionResponse) where TEntity : Entity
     {
-        return collectionResponse.BackingStore.Get<List<TEntity>>("value") ?? [];
+        return collectionResponse?.BackingStore.Get<List<TEntity>>("value") ?? [];
     }
 
     public static async Task<TCollectionResponse?> GetNextPageAsync<TCollectionResponse>(this TCollectionResponse? collectionResponse, IRequestAdapter requestAdapter, CancellationToken cancellationToken = default)

MsGraphSamples.WPF/Helpers/Converters.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.Graph.Models;
+using MsGraphSamples.Services;
 using System.Globalization;
 using System.Windows.Data;
 
@@ -19,7 +20,6 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
 }
-
 public class DirectoryObjectsCountConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
@@ -29,9 +29,31 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         if (directoryObjects == null)
             return string.Empty;
 
-        var directoryObjectCollection = directoryObjects.BackingStore?.Get<IEnumerable<DirectoryObject>?>("value");
-        return $"{directoryObjectCollection?.Count() ?? 0} / {directoryObjects.OdataCount}";
+        var directoryObjectCollection = directoryObjects.BackingStore.Get<IEnumerable<DirectoryObject>>("value") ?? [];
+        return $"{directoryObjectCollection.Count()} / {directoryObjects.OdataCount}";
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
-}
+}
+
+public class DirectoryObjectsValueConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        var directoryObjects = (BaseCollectionPaginationCountResponse?)value;
+        return directoryObjects switch
+        {
+            UserCollectionResponse => directoryObjects.GetValue<User>(),
+            GroupCollectionResponse => directoryObjects.GetValue<Group>(),
+            ApplicationCollectionResponse => directoryObjects.GetValue<Application>(),
+            ServicePrincipalCollectionResponse => directoryObjects.GetValue<ServicePrincipal>(),
+            DeviceCollectionResponse => directoryObjects.GetValue<Device>(),
+            _ => Enumerable.Empty<DirectoryObject>()
+        };
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

MsGraphSamples.WPF/ViewModels/MainViewModel.cs

@@ -40,6 +40,7 @@ public partial class MainViewModel(IAuthService authService, IGraphDataService g
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(LaunchGraphExplorerCommand))]
     [NotifyCanExecuteChangedFor(nameof(LoadNextPageCommand))]
+    [NotifyPropertyChangedFor(nameof(LastUrl))]
     private BaseCollectionPaginationCountResponse? _directoryObjects;
 
     #region OData Operators
@@ -164,8 +165,8 @@ private async Task LoadNextPage()
     private Task Sort(DataGridSortingEventArgs e)
     {
         OrderBy = e.Column.SortDirection == null || e.Column.SortDirection == ListSortDirection.Descending
-            ? $"{e.Column.Header} asc"
-            : $"{e.Column.Header} desc";
+                ? $"{e.Column.Header} asc"
+                : $"{e.Column.Header} desc";
 
         // Prevent client-side sorting
         e.Handled = true;
@@ -230,7 +231,6 @@ private async Task IsBusyWrapper(Func<Task> loadOperation)
         {
             _stopWatch.Stop();
             OnPropertyChanged(nameof(ElapsedMs));
-            OnPropertyChanged(nameof(LastUrl));
             IsBusy = false;
         }
     }

MsGraphSamples.WPF/ViewModels/ViewModelLocator.cs

@@ -25,22 +25,16 @@ private static ServiceProvider GetServices()
     {
         var serviceCollection = new ServiceCollection();
 
-        if (IsInDesignMode)
-        {
-        }
-        else
+        if (!IsInDesignMode)
         {
             var authService = new AuthService();
             serviceCollection.AddSingleton<IAuthService>(authService);
 
             var graphDataService = new GraphDataService(authService.GraphClient);
             serviceCollection.AddSingleton<IGraphDataService>(graphDataService);
-
-            var asyncEnumerableGraphDataService = new AsyncEnumerableGraphDataService(authService.GraphClient);
-            serviceCollection.AddSingleton<IAsyncEnumerableGraphDataService>(asyncEnumerableGraphDataService);
         }
 
-        serviceCollection.AddSingleton<MainViewModel>();
+        serviceCollection.AddTransient<MainViewModel>();
 
         return serviceCollection.BuildServiceProvider();
     }

MsGraphSamples.WPF/Views/MainWindow.xaml

@@ -48,6 +48,7 @@
     <Grid>
         <Grid.Resources>
             <converters:DirectoryObjectsCountConverter x:Key="DirectoryObjectsCount" />
+            <converters:DirectoryObjectsValueConverter x:Key="DirectoryObjectsValue" />
         </Grid.Resources>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -154,12 +155,7 @@
                 Grid.Row="0"
                 Grid.Column="2"
                 Margin="6,0">
-                <TextBlock FontWeight="Bold">
-                    <Run Text="Entities: "/>
-                    <Run Text="{Binding DirectoryObjects.Value.Count, Mode=OneWay}"/>
-                    <Run Text=" / "/>
-                    <Run Text="{Binding DirectoryObjects.OdataCount, Mode=OneWay}" />
-                </TextBlock>
+                <TextBlock FontWeight="Bold" Text="{Binding DirectoryObjects, Mode=OneWay, Converter={StaticResource DirectoryObjectsCount}, StringFormat='Entities: {0}', FallbackValue='Entities:'}" />
                 <ComboBox
                     Width="120"
                     ItemsSource="{Binding Entities}"
@@ -220,7 +216,7 @@
             AutoGeneratedColumns="ResultsDataGrid_AutoGeneratedColumns"
             AutoGeneratingColumn="ResultsDataGrid_AutoGeneratingColumn"
             IsReadOnly="True"
-            ItemsSource="{Binding DirectoryObjects.Value}"
+            ItemsSource="{Binding DirectoryObjects, Converter={StaticResource DirectoryObjectsValue}}"
             SelectedItem="{Binding SelectedObject}"
             SelectionMode="Single">
             <i:Interaction.Triggers>

MsGraphSamples.WinUI/App.xaml.cs

@@ -6,6 +6,7 @@
 using MsGraphSamples.Services;
 using MsGraphSamples.WinUI.ViewModels;
 using MsGraphSamples.WinUI.Views;
+using Windows.ApplicationModel;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -32,11 +33,14 @@ private static ServiceProvider GetServices()
     {
         var serviceCollection = new ServiceCollection();
 
-        var authService = new AuthService();
-        serviceCollection.AddSingleton<IAuthService>(authService);
+        if (!DesignMode.DesignModeEnabled)
+        {
+            var authService = new AuthService();
+            serviceCollection.AddSingleton<IAuthService>(authService);
 
-        var asyncEnumerableGraphDataService = new AsyncEnumerableGraphDataService(authService.GraphClient);
-        serviceCollection.AddSingleton<IAsyncEnumerableGraphDataService>(asyncEnumerableGraphDataService);
+            var asyncEnumerableGraphDataService = new AsyncEnumerableGraphDataService(authService.GraphClient);
+            serviceCollection.AddSingleton<IAsyncEnumerableGraphDataService>(asyncEnumerableGraphDataService);
+        }
 
         serviceCollection.AddTransient<MainViewModel>();
 

MsGraphSamples.WinUI/MsGraphSamples.WinUI.csproj

@@ -30,6 +30,7 @@
 
 		<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Graph" Version="5.56.0" />

MsGraphSamples.WinUI/ViewModels/MainViewModel.cs

@@ -26,16 +26,22 @@ public partial class MainViewModel(IAuthService authService, IAsyncEnumerableGra
     public long ElapsedMs => _stopWatch.ElapsedMilliseconds;
 
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsIndeterminate))]
     private bool _isBusy = false;
 
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsIndeterminate))]
     private bool _isError = false;
 
+    public bool IsIndeterminate => IsBusy || IsError;
+
     [ObservableProperty]
     private string? _userName;
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(LaunchGraphExplorerCommand))]
+    [NotifyPropertyChangedFor(nameof(LastUrl))]
+    [NotifyPropertyChangedFor(nameof(LastCount))]
     private AsyncLoadingCollection<DirectoryObject>? _directoryObjects;
 
     [ObservableProperty]
@@ -204,7 +210,6 @@ private async Task IsBusyWrapper(IAsyncEnumerable<DirectoryObject> directoryObje
             DirectoryObjects = new(directoryObjects, pageSize);
             await DirectoryObjects.LoadMoreItemsAsync();
 
-
             SelectedEntity = DirectoryObjects.FirstOrDefault() switch
             {
                 User => "Users",
@@ -223,14 +228,12 @@ private async Task IsBusyWrapper(IAsyncEnumerable<DirectoryObject> directoryObje
         catch (ApiException ex)
         {
             IsError = true;
-            await ShowDialogAsync(ex.Message, Enum.GetName((HttpStatusCode)ex.ResponseStatusCode));
+            await ShowDialogAsync(Enum.GetName((HttpStatusCode)ex.ResponseStatusCode)!, ex.Message);
         }
         finally
         {
             _stopWatch.Stop();
             OnPropertyChanged(nameof(ElapsedMs));
-            OnPropertyChanged(nameof(LastUrl));
-            OnPropertyChanged(nameof(LastCount));
             IsBusy = false;
         }
     }

MsGraphSamples.WinUI/Views/MainPage.xaml

@@ -5,16 +5,22 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:graph="using:Microsoft.Graph.Models"
     xmlns:i="using:Microsoft.Xaml.Interactivity"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:sys="using:System" Loaded="Page_Loaded"
     xmlns:vm="using:MsGraphSamples.WinUI.ViewModels"
     d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
+    Loaded="Page_Loaded"
     mc:Ignorable="d">
 
-    <Grid Margin="0,24,0,0">
+    <Page.Resources>
+        <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
+        <converters:StringFormatConverter x:Key="StringFormatConverter" />
+    </Page.Resources>
+
+    <Grid Margin="0,28,0,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -84,10 +90,13 @@
                 Margin="6,0"
                 VerticalAlignment="Bottom">
 
-                <TextBlock
-                    Margin="0,3"
-                    FontWeight="Bold"
-                    Text="{x:Bind sys:String.Format(x:Null, 'Entities: {0:N0} / {1:N0}', ViewModel.DirectoryObjects.Count, ViewModel.LastCount), Mode=OneWay}" />
+                <TextBlock Margin="0,3" FontWeight="Bold">
+                    <Run Text="Entities: " />
+                    <Run Text="{x:Bind ViewModel.DirectoryObjects.Count, Mode=OneWay}" />
+                    <Run Text=" / " />
+                    <Run Text="{x:Bind ViewModel.LastCount, Mode=OneWay}" />
+                </TextBlock>
+                
                 <ComboBox
                     HorizontalAlignment="Stretch"
                     ItemsSource="{x:Bind vm:MainViewModel.Entities}"
@@ -147,7 +156,8 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Bottom"
                 Command="{x:Bind ViewModel.LoadCommand}"
-                Content="Load" />
+                Content="Load"
+                IsEnabled="{x:Bind ViewModel.IsBusy, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
 
             <!--  Graph Explorer  -->
             <TextBox
@@ -165,7 +175,8 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Command="{x:Bind ViewModel.LaunchGraphExplorerCommand}"
-                Content="Graph Explorer" />
+                Content="Graph Explorer"
+                IsEnabled="{x:Bind ViewModel.IsBusy, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
         </Grid>
 
         <!--  Query Results  -->
@@ -195,10 +206,7 @@
             </i:Interaction.Behaviors>
         </controls:DataGrid>
 
-        <Grid
-            Grid.Row="2"
-            Margin="6"
-            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}">
+        <Grid Grid.Row="2" Margin="6">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
@@ -209,25 +217,26 @@
             <TextBlock
                 Margin="6,0"
                 VerticalAlignment="Center"
-                Text="{x:Bind sys:String.Format('Hello {0}', ViewModel.UserName), Mode=OneWay}" />
+                Text="{x:Bind ViewModel.UserName, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter='Hello {0}'}" />
 
-            <!--<Button Grid.Column="2"
-                    Margin="0,0,6,0"
-                    Padding="6,0"
-                    Command="{x:Bind ViewModel.LogoutCommand}"
-                    Content="Logout" />-->
+            <Button
+                Grid.Column="1"
+                Margin="6,0"
+                Padding="6,0"
+                Command="{x:Bind ViewModel.LogoutCommand}"
+                Content="Logout" />
 
             <ProgressBar
                 Grid.Column="2"
-                Margin="0,0,6,0"
-                HorizontalContentAlignment="Stretch"
-                IsIndeterminate="{x:Bind ViewModel.IsBusy, Mode=OneWay}"
+                Margin="6,0"
+                VerticalAlignment="Center"
+                IsIndeterminate="{x:Bind ViewModel.IsIndeterminate, Mode=OneWay}"
                 ShowError="{x:Bind ViewModel.IsError, Mode=OneWay}" />
 
             <TextBlock
                 Grid.Column="3"
-                Margin="0,0,6,0"
-                Text="{x:Bind sys:String.Format('{0:N0} ms', ViewModel.ElapsedMs), Mode=OneWay}" />
+                Margin="6,0"
+                Text="{x:Bind ViewModel.ElapsedMs, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:N0} ms'}" />
         </Grid>
     </Grid>
 </Page>