Fixed grouping

Filling projects at startup

src/BuildVision.UI/Components/ControlView.xaml.cs

@@ -1,6 +1,8 @@
-using System.Globalization;
+using System.ComponentModel;
+using System.Globalization;
 using System.Windows.Controls;
 using System.Windows.Markup;
+using BuildVision.UI.ViewModels;
 
 namespace BuildVision.UI
 {
@@ -9,12 +11,23 @@ namespace BuildVision.UI
     /// </summary>
     public partial class ControlView : UserControl
     {
+        public BuildVisionPaneViewModel ViewModel
+        {
+            get => (BuildVisionPaneViewModel)DataContext;
+            set => DataContext = value;
+        }
+
         public ControlView()
         {
             InitializeComponent();
             // Ensure the current culture passed into bindings is the OS culture.
             // By default, WPF uses en-US as the culture, regardless of the system settings.
             Language = XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag);
+
+            if (DesignerProperties.GetIsInDesignMode(new System.Windows.DependencyObject()))
+            {
+                ViewModel = new BuildVisionPaneViewModel();
+            }
         }
     }
 }

src/BuildVision.UI/Components/ProjectGrid.xaml.cs

@@ -1,10 +1,13 @@
 using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Markup;
 using System.Windows.Media;
 using BuildVision.UI.Converters;
 using BuildVision.UI.DataGrid;
@@ -15,73 +18,77 @@ namespace BuildVision.UI.Components
 {
     public partial class ProjectGrid : UserControl
     {
-        private BuildVisionPaneViewModel _viewModel;
+        public BuildVisionPaneViewModel ViewModel
+        {
+            get => (BuildVisionPaneViewModel)DataContext;
+            set => DataContext = value;
+        }
 
         public ProjectGrid()
         {
             InitializeComponent();
-
+            // Ensure the current culture passed into bindings is the OS culture.
+            // By default, WPF uses en-US as the culture, regardless of the system settings.
+            Language = XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag);
             Grid.TargetUpdated += GridOnTargetUpdated;
         }
 
         private void GridOnTargetUpdated(object sender, DataTransferEventArgs e)
         {
-            if (e.Property.Name == "ItemsSource")
+            if (e.Property.Name == nameof(Grid.ItemsSource))
+            {
                 RefreshSortDirectionInGrid();
+            }
         }
 
         private void RefreshSortDirectionInGrid()
         {
-            DataGridColumn dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == _viewModel.GridSortDescription.Property);
+            Debug.Assert(Grid.Columns != null);
+            var dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == ViewModel.GridSortDescription.Property);
             if (dataGridColumn != null)
             {
-                dataGridColumn.SortDirection = _viewModel.GridSortDescription.Order.ToSystem();
+                dataGridColumn.SortDirection = ViewModel.GridSortDescription.Order.ToSystem();
             }
         }
 
         private void GridOnSorting(object sender, DataGridSortingEventArgs e)
         {
-            if (_viewModel.GridSorting.CanExecute(e))
+            if (ViewModel.GridSorting.CanExecute(e))
             {
-                _viewModel.GridSorting.Execute(e);
+                ViewModel.GridSorting.Execute(e);
             }
         }
 
         private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            _viewModel = (BuildVisionPaneViewModel)DataContext;
-            _viewModel.SetGridColumnsRef(Grid.Columns);
-            _viewModel.PropertyChanged += ViewModelOnPropertyChanged;
+            Debug.Assert(ViewModel != null);
+            ViewModel = (BuildVisionPaneViewModel)DataContext;
+            ViewModel.SetGridColumnsRef(Grid.Columns);
+            ViewModel.PropertyChanged += ViewModelOnPropertyChanged;
         }
 
         private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             //TODO implement logic for scrolling tu currentproject
-            if (_viewModel.BuildInformationModel.CurrentProject != null && e.PropertyName == "CurrentProject")
+            if (ViewModel.BuildInformationModel.CurrentProject != null && e.PropertyName == "CurrentProject")
             {
                 // TODO: Remove SelectedIndex = -1 and implement Unselect row feature by clicking on selected row.
                 Grid.SelectedIndex = -1;
 
                 if (Grid.SelectedIndex == -1)
-                    Grid.ScrollIntoView(_viewModel.BuildInformationModel.CurrentProject);
+                    Grid.ScrollIntoView(ViewModel.BuildInformationModel.CurrentProject);
             }
         }
 
         private void DataGridExpanderOnExpanded(object sender, RoutedEventArgs e)
         {
-            ExpanderIsExpandedConverter.SaveState(
-                (Expander)sender,
-                false,
-                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
+            ExpanderIsExpandedConverter.SaveState((Expander)sender, false, ViewModel.ControlSettings.GridSettings.CollapsedGroups);
             e.Handled = true;
         }
 
         private void DataGridExpanderOnCollapsed(object sender, RoutedEventArgs e)
         {
-            ExpanderIsExpandedConverter.SaveState(
-                (Expander)sender,
-                true,
-                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
+            ExpanderIsExpandedConverter.SaveState((Expander)sender, true, ViewModel.ControlSettings.GridSettings.CollapsedGroups);
             e.Handled = true;
         }
 
@@ -114,12 +121,7 @@ private void DataGridRowOnPreviewMouseLeftButtonDown(object sender, MouseButtonE
             {
                 row.Focusable = true;
                 row.Focus();
-
-                // Gets the element with keyboard focus.
-                var elementWithFocus = Keyboard.FocusedElement as UIElement;
-
-                // Change keyboard focus.
-                if (elementWithFocus != null)
+                if (Keyboard.FocusedElement is UIElement elementWithFocus)
                 {
                     var request = new TraversalRequest(FocusNavigationDirection.Next);
                     elementWithFocus.MoveFocus(request);

src/BuildVision.UI/Converters/ExpanderIsExpandedConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Windows.Controls;
@@ -11,7 +11,7 @@ public class ExpanderIsExpandedConverter : IMultiValueConverter
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
             var collectionViewGroup = (CollectionViewGroup)values[0];
-            var collapsedGroups = (IList<string>)values[1];
+            var collapsedGroups = values[1] as IList<string>;
 
             if (collapsedGroups == null || collapsedGroups.Count == 0)
                 return true;

src/BuildVision.UI/Models/ProjectItem.cs

@@ -13,11 +13,6 @@ public class ProjectItem : BindableBase, IProjectItem
     {
         private const string ResourcesUri = @"Resources/ProjectItem.Resources.xaml";
 
-        public ProjectItem()
-        {
-            State = ProjectState.Pending;
-        }
-
         public bool IsBatchBuildProject { get; set; }
 
         private string _uniqueName;
@@ -258,6 +253,11 @@ public string SolutionFolder
         }
         public bool Success { get; set; }
 
+        public ProjectItem()
+        {
+            State = ProjectState.Pending;
+        }
+
         public void RaiseBuildElapsedTimeChanged()
         {
             OnPropertyChanged(nameof(BuildElapsedTime));

src/BuildVision.UI/Settings/Models/GridSettings.cs

@@ -50,11 +50,6 @@ public string GroupName
             set => _groupName = value;
         }
 
-        /// <summary>
-        /// User-friendly header format for groups.
-        /// For example, "{title}: {value} - {count} items".
-        /// Available arguments see in <see cref="GroupHeaderFormatArgs"/>.
-        /// </summary>
         public string GroupHeaderFormat
         {
             get => _groupHeaderFormat ?? (_groupHeaderFormat = "{title}: {value}");
@@ -75,18 +70,18 @@ public SortDescription Sort
 
         public List<string> CollapsedGroups => _collapsedGroups ?? (_collapsedGroups = new List<string>());
 
-        /// <summary>
-        /// Converts user-friendly string format with <see cref="GroupHeaderFormatArgs"/> arguments
-        /// into system format string (with {0},{1},... arguments).
-        /// </summary>
         private static string ConvertGroupHeaderToRawFormat(string userFriendlyFormatString)
         {
             if (string.IsNullOrEmpty(userFriendlyFormatString))
+            {
                 return string.Empty;
+            }
 
             string rawFormat = userFriendlyFormatString;
             for (int i = 0; i < GroupHeaderFormatArgs.Length; i++)
+            {
                 rawFormat = rawFormat.Replace("{" + GroupHeaderFormatArgs[i], "{" + i);
+            }
 
             return rawFormat;
         }

src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs

@@ -59,7 +59,7 @@ public bool HideUpToDateTargets
 
         public ControlSettings ControlSettings { get; }
 
-        public ObservableCollection<IProjectItem> Projects { get; set; }
+        public ObservableCollection<IProjectItem> Projects { get; }
 
         public IBuildInformationModel BuildInformationModel { get; set; }
 
@@ -146,14 +146,12 @@ public ListCollectionView GroupedProjectsList
         {
             get
             {
-                var groupedList = new ListCollectionView(Projects); // todo use projects here ProjectsList);
-
+                var groupedList = new ListCollectionView(Projects); 
                 if (!string.IsNullOrWhiteSpace(GridGroupPropertyName))
                 {
                     Debug.Assert(groupedList.GroupDescriptions != null);
                     groupedList.GroupDescriptions.Add(new PropertyGroupDescription(GridGroupPropertyName));
                 }
-
                 groupedList.CustomSort = GetProjectItemSorter(GridSortDescription);
                 groupedList.IsLiveGrouping = true;
                 groupedList.IsLiveSorting = true;
@@ -183,7 +181,7 @@ public ProjectItem SelectedProjectItem
             set => SetProperty(ref _selectedProjectItem, value);
         }
 
-        internal BuildVisionPaneViewModel()
+        public BuildVisionPaneViewModel()
         {
             ControlSettings = new ControlSettings();
             BuildInformationModel = new BuildInformationModel();
@@ -347,7 +345,10 @@ private void CopyErrorMessageToClipboard(ProjectItem projectItem)
 
         public ICommand GridSorting => new RelayCommand(obj => ReorderGrid(obj));
 
-        public ICommand GridGroupPropertyMenuItemClicked => new RelayCommand(obj => GridGroupPropertyName = (obj != null) ? obj.ToString() : string.Empty);
+        public ICommand GridGroupPropertyMenuItemClicked => new RelayCommand(obj =>
+        {
+            GridGroupPropertyName = (obj != null) ? obj.ToString() : string.Empty;
+        });
 
         public ICommand SelectedProjectOpenContainingFolderAction => new RelayCommand(obj => OpenContainingFolder(), canExecute: obj => (SelectedProjectItem != null && !string.IsNullOrEmpty(SelectedProjectItem.FullName)));
 

src/BuildVision/BuildVision.csproj

@@ -84,6 +84,7 @@
     <Compile Include="Commands\ShowToolWindowCommand.cs" />
     <Compile Include="Constants\EnvDTECodeModelLanguageConstants2.cs" />
     <Compile Include="Extensions\BuildActionsExtensions.cs" />
+    <Compile Include="Extensions\BuildStateExtensions.cs" />
     <Compile Include="Extensions\IServiceProviderExtensions.cs" />
     <Compile Include="Services\BuildInformationProvider.cs" />
     <Compile Include="Services\ErrorNavigationService.cs" />

src/BuildVision/Extensions/BuildStateExtensions.cs

@@ -0,0 +1,35 @@
+using System.Windows.Shell;
+using BuildVision.Contracts;
+
+namespace BuildVision.Extensions
+{
+    public static class BuildStateExtensions
+    {
+        public static TaskbarItemProgressState ToTaskBarItemProgressState(this BuildState buildState, BuildScopes buildScope)
+        {
+            var progressState = TaskbarItemProgressState.Normal;
+            if (buildState == BuildState.Cancelled)
+            {
+                progressState = TaskbarItemProgressState.Paused;
+            }
+            else if (buildState == BuildState.Failed)
+            {
+                progressState = TaskbarItemProgressState.Error;
+            }
+            else if (buildState != BuildState.InProgress)
+            {
+                progressState = TaskbarItemProgressState.None;
+            }
+            else if (buildScope != BuildScopes.BuildScopeSolution)
+            {
+                progressState = TaskbarItemProgressState.Indeterminate;
+            }
+            else
+            {
+                progressState = TaskbarItemProgressState.Normal;
+            }
+
+            return progressState;
+        }
+    }
+}