From c2fc074239f289beafe77b6379d6310af403fb95 Mon Sep 17 00:00:00 2001
From: ssparach <128866445+ssparach@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:23:09 -0700
Subject: [PATCH 1/2] accessibility bug fixes

---
 .../Models/RepositoryInformation.cs                  | 12 ++++++++++--
 .../ViewModels/FileExplorerViewModel.cs              |  4 +++-
 .../Views/AddRepositoriesView.xaml                   | 11 ++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs b/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs
index a274836ad5..3cd779d165 100644
--- a/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs
+++ b/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using DevHome.Common.Extensions;
@@ -21,13 +20,22 @@ public class RepositoryInformation
 
     public string SourceControlProviderPackageDisplayName { get; }
 
-    public RepositoryInformation(string rootpath, string classId)
+    public string RepoPathMapping { get; }
+
+    public int Position { get; }
+
+    public int Size { get; }
+
+    public RepositoryInformation(string rootpath, string classId, int position, int size)
     {
         RepositoryRootPath = rootpath;
         SourceControlProviderCLSID = classId;
         var extension = GetExtension(classId);
         SourceControlProviderDisplayName = GetExtensionDisplayName(extension);
         SourceControlProviderPackageDisplayName = GetExtensionPackageDisplayName(extension);
+        RepoPathMapping = string.Concat(RepositoryRootPath, " ", SourceControlProviderDisplayName);
+        Position = position;
+        Size = size;
     }
 
     private IExtensionWrapper? GetExtension(string classId)
diff --git a/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs b/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
index 2a4845ed55..5222ef5109 100644
--- a/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
+++ b/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
@@ -70,9 +70,11 @@ public void RefreshTrackedRepositories()
         {
             TrackedRepositories.Clear();
             var repoCollection = RepoTracker.GetAllTrackedRepositories();
+            var position = 0;
             foreach (KeyValuePair<string, string> data in repoCollection)
             {
-                TrackedRepositories.Add(new RepositoryInformation(data.Key, data.Value));
+                position++;
+                TrackedRepositories.Add(new RepositoryInformation(data.Key, data.Value, position, repoCollection.Count));
             }
         }
     }
diff --git a/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml b/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml
index 77d93f3106..77751d117d 100644
--- a/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml
+++ b/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml
@@ -17,7 +17,7 @@
             x:Uid="AddRepositoriesCard"
             Grid.Column="1">
             <Button 
-                x:Uid="AddFolderButton" 
+                x:Uid="AddFolderButton"
                 Style="{ThemeResource AccentButtonStyle}" 
                 Command="{x:Bind ViewModel.AddFolderClickCommand}" />
         </ctControls:SettingsCard>
@@ -40,7 +40,10 @@
                             Orientation="Horizontal">
                             <DropDownButton 
                                 Content="{Binding SourceControlProviderDisplayName}"
-                                ToolTipService.ToolTip="{Binding SourceControlProviderPackageDisplayName}">
+                                AutomationProperties.Name="{Binding RepoPathMapping}"
+                                ToolTipService.ToolTip="{Binding SourceControlProviderPackageDisplayName}"
+                                AutomationProperties.PositionInSet="{Binding Position}"
+                                AutomationProperties.SizeOfSet="{Binding Size}">
                                 <DropDownButton.Flyout>
                                     <MenuFlyout 
                                         Opening="SourceControlProviderMenuFlyout_Opening"
@@ -48,7 +51,9 @@
                                     </MenuFlyout>
                                 </DropDownButton.Flyout>
                             </DropDownButton>
-                            <Button 
+                            <Button
+                                AutomationProperties.PositionInSet="{Binding Position}"
+                                AutomationProperties.SizeOfSet="{Binding Size}"
                                 x:Uid="MoreOptionsButton"
                                 Content="&#xe712;"
                                 Height="36" 

From 1ce6c10601fdb527691d70c2024a2fabe80399d7 Mon Sep 17 00:00:00 2001
From: ssparach <128866445+ssparach@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:53:57 -0700
Subject: [PATCH 2/2] address PR feedback

---
 .../DevHome.Customization/Models/RepositoryInformation.cs | 4 ++--
 .../ViewModels/FileExplorerViewModel.cs                   | 8 ++++----
 .../DevHome.Customization/Views/AddRepositoriesView.xaml  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs b/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs
index 3cd779d165..37c34dca17 100644
--- a/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs
+++ b/tools/Customization/DevHome.Customization/Models/RepositoryInformation.cs
@@ -20,7 +20,7 @@ public class RepositoryInformation
 
     public string SourceControlProviderPackageDisplayName { get; }
 
-    public string RepoPathMapping { get; }
+    public string RepositoryPathMapping { get; }
 
     public int Position { get; }
 
@@ -33,7 +33,7 @@ public RepositoryInformation(string rootpath, string classId, int position, int
         var extension = GetExtension(classId);
         SourceControlProviderDisplayName = GetExtensionDisplayName(extension);
         SourceControlProviderPackageDisplayName = GetExtensionPackageDisplayName(extension);
-        RepoPathMapping = string.Concat(RepositoryRootPath, " ", SourceControlProviderDisplayName);
+        RepositoryPathMapping = string.Concat(RepositoryRootPath, " ", SourceControlProviderDisplayName);
         Position = position;
         Size = size;
     }
diff --git a/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs b/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
index 5222ef5109..42e8f33d2a 100644
--- a/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
+++ b/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -70,11 +71,10 @@ public void RefreshTrackedRepositories()
         {
             TrackedRepositories.Clear();
             var repoCollection = RepoTracker.GetAllTrackedRepositories();
-            var position = 0;
-            foreach (KeyValuePair<string, string> data in repoCollection)
+            for (int position = 0; position < repoCollection.Count; position++)
             {
-                position++;
-                TrackedRepositories.Add(new RepositoryInformation(data.Key, data.Value, position, repoCollection.Count));
+                var data = repoCollection.ElementAt(position);
+                TrackedRepositories.Add(new RepositoryInformation(data.Key, data.Value, position + 1, repoCollection.Count));
             }
         }
     }
diff --git a/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml b/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml
index 77751d117d..6c22bf4474 100644
--- a/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml
+++ b/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml
@@ -40,7 +40,7 @@
                             Orientation="Horizontal">
                             <DropDownButton 
                                 Content="{Binding SourceControlProviderDisplayName}"
-                                AutomationProperties.Name="{Binding RepoPathMapping}"
+                                AutomationProperties.Name="{Binding RepositoryPathMapping}"
                                 ToolTipService.ToolTip="{Binding SourceControlProviderPackageDisplayName}"
                                 AutomationProperties.PositionInSet="{Binding Position}"
                                 AutomationProperties.SizeOfSet="{Binding Size}">