Merge branch 'master' into fixes/2211-signal-complete-when-opening-from-start-page

Author: jcansdale

src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs

@@ -2,6 +2,7 @@
 using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Models;
+using GitHub.Primitives;
 using GitHub.ViewModels;
 using GitHub.ViewModels.Dialog.Clone;
 using ReactiveUI;
@@ -17,13 +18,13 @@ public RepositoryCloneViewModelDesigner()
         }
 
         public string Path { get; set; }
+        public UriString Url { get; set; }
         public string PathWarning { get; set; }
         public int SelectedTabIndex { get; set; }
         public string Title => null;
         public IObservable<object> Done => null;
         public IRepositorySelectViewModel GitHubTab { get; }
         public IRepositorySelectViewModel EnterpriseTab { get; }
-        public IRepositoryUrlViewModel UrlTab { get; }
         public ReactiveCommand<Unit, Unit> Browse { get; }
         public ReactiveCommand<Unit, CloneDialogResult> Clone { get; }
 

src/GitHub.App/Services/DialogService.cs

@@ -51,7 +51,7 @@ public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection, str
             var viewModel = factory.CreateViewModel<IRepositoryCloneViewModel>();
             if (url != null)
             {
-                viewModel.UrlTab.Url = url;
+                viewModel.Url = url;
             }
 
             if (connection != null)

src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs

@@ -9,6 +9,7 @@
 using GitHub.Extensions;
 using GitHub.Logging;
 using GitHub.Models;
+using GitHub.Primitives;
 using GitHub.Services;
 using ReactiveUI;
 using Rothko;
@@ -20,15 +21,14 @@ namespace GitHub.ViewModels.Dialog.Clone
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public class RepositoryCloneViewModel : ViewModelBase, IRepositoryCloneViewModel
     {
-        static readonly ILogger log = LogManager.ForContext<RepositoryCloneViewModel>();
         readonly IOperatingSystem os;
         readonly IConnectionManager connectionManager;
         readonly IRepositoryCloneService service;
         readonly IGitService gitService;
-        readonly IUsageService usageService;
         readonly IUsageTracker usageTracker;
         readonly IReadOnlyList<IRepositoryCloneTabViewModel> tabs;
         string path;
+        UriString url;
         RepositoryModel previousRepository;
         ObservableAsPropertyHelper<string> pathWarning;
         int selectedTabIndex;
@@ -39,23 +39,19 @@ public RepositoryCloneViewModel(
             IConnectionManager connectionManager,
             IRepositoryCloneService service,
             IGitService gitService,
-            IUsageService usageService,
             IUsageTracker usageTracker,
             IRepositorySelectViewModel gitHubTab,
-            IRepositorySelectViewModel enterpriseTab,
-            IRepositoryUrlViewModel urlTab)
+            IRepositorySelectViewModel enterpriseTab)
         {
             this.os = os;
             this.connectionManager = connectionManager;
             this.service = service;
             this.gitService = gitService;
-            this.usageService = usageService;
             this.usageTracker = usageTracker;
 
             GitHubTab = gitHubTab;
             EnterpriseTab = enterpriseTab;
-            UrlTab = urlTab;
-            tabs = new IRepositoryCloneTabViewModel[] { GitHubTab, EnterpriseTab, UrlTab };
+            tabs = new IRepositoryCloneTabViewModel[] { GitHubTab, EnterpriseTab };
 
             var repository = this.WhenAnyValue(x => x.SelectedTabIndex)
                 .SelectMany(x => tabs[x].WhenAnyValue(tab => tab.Repository));
@@ -88,14 +84,19 @@ public RepositoryCloneViewModel(
 
         public IRepositorySelectViewModel GitHubTab { get; }
         public IRepositorySelectViewModel EnterpriseTab { get; }
-        public IRepositoryUrlViewModel UrlTab { get; }
 
         public string Path
         {
             get => path;
             set => this.RaiseAndSetIfChanged(ref path, value);
         }
 
+        public UriString Url
+        {
+            get => url;
+            set => this.RaiseAndSetIfChanged(ref url, value);
+        }
+
         public string PathWarning => pathWarning.Value;
 
         public int SelectedTabIndex
@@ -135,26 +136,21 @@ public async Task InitializeAsync(IConnection connection)
                 SelectedTabIndex = 1;
             }
 
-            this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
-
-            // When a clipboard URL has been set, show the URL tab by default
-            if (!string.IsNullOrEmpty(UrlTab.Url))
+            if (Url?.Host is string host && HostAddress.Create(host) is HostAddress hostAddress)
             {
-                SelectedTabIndex = 2;
+                if (hostAddress == gitHubConnection?.HostAddress)
+                {
+                    GitHubTab.Filter = Url;
+                    SelectedTabIndex = 0;
+                }
+                else if (hostAddress == enterpriseConnection?.HostAddress)
+                {
+                    EnterpriseTab.Filter = Url;
+                    SelectedTabIndex = 1;
+                }
             }
 
-            switch (SelectedTabIndex)
-            {
-                case 0:
-                    usageTracker.IncrementCounter(model => model.NumberOfCloneViewGitHubTab).Forget();
-                    break;
-                case 1:
-                    usageTracker.IncrementCounter(model => model.NumberOfCloneViewEnterpriseTab).Forget();
-                    break;
-                case 2:
-                    usageTracker.IncrementCounter(model => model.NumberOfCloneViewUrlTab).Forget();
-                    break;
-            }
+            this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
         }
 
         void BrowseForDirectory()

src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs

@@ -7,6 +7,7 @@
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using System.Windows.Data;
+using GitHub.Exports;
 using GitHub.Extensions;
 using GitHub.Logging;
 using GitHub.Models;
@@ -23,6 +24,7 @@ public class RepositorySelectViewModel : ViewModelBase, IRepositorySelectViewMod
     {
         static readonly ILogger log = LogManager.ForContext<RepositorySelectViewModel>();
         readonly IRepositoryCloneService service;
+        readonly IGitHubContextService gitHubContextService;
         IConnection connection;
         Exception error;
         string filter;
@@ -35,15 +37,26 @@ public class RepositorySelectViewModel : ViewModelBase, IRepositorySelectViewMod
         IRepositoryItemViewModel selectedItem;
 
         [ImportingConstructor]
-        public RepositorySelectViewModel(IRepositoryCloneService service)
+        public RepositorySelectViewModel(IRepositoryCloneService service, IGitHubContextService gitHubContextService)
         {
             Guard.ArgumentNotNull(service, nameof(service));
+            Guard.ArgumentNotNull(service, nameof(gitHubContextService));
 
             this.service = service;
+            this.gitHubContextService = gitHubContextService;
 
-            repository = this.WhenAnyValue(x => x.SelectedItem)
-                .Select(CreateRepository)
+            var selectedRepository = this.WhenAnyValue(x => x.SelectedItem)
+                .Select(CreateRepository);
+
+            var filterRepository = this.WhenAnyValue(x => x.Filter)
+                .Select(f => gitHubContextService.FindContextFromUrl(f))
+                .Where(c => c?.LinkType == LinkType.Repository)
+                .Select(c => new RepositoryModel(c.RepositoryName, c.Url));
+
+            repository = selectedRepository
+                .Merge(filterRepository)
                 .ToProperty(this, x => x.Repository);
+
             this.WhenAnyValue(x => x.Filter).Subscribe(_ => ItemsView?.Refresh());
         }
 
@@ -166,7 +179,14 @@ bool FilterItem(object obj)
         {
             if (obj is IRepositoryItemViewModel item && !string.IsNullOrWhiteSpace(Filter))
             {
-                return item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase);
+                var urlString = item.Url.ToString();
+                var urlStringWithGit = urlString + ".git";
+                var urlStringWithSlash = urlString + "/";
+                return
+                    item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase) ||
+                    urlString.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
+                    urlStringWithGit.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
+                    urlStringWithSlash.Contains(Filter, StringComparison.OrdinalIgnoreCase);
             }
 
             return true;

src/GitHub.App/ViewModels/Dialog/Clone/RepositoryUrlViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Reactive;
 using GitHub.Models;
+using GitHub.Primitives;
 using ReactiveUI;
 
 namespace GitHub.ViewModels.Dialog.Clone
@@ -21,9 +22,9 @@ public interface IRepositoryCloneViewModel : IDialogContentViewModel, IConnectio
         IRepositorySelectViewModel EnterpriseTab { get; }
 
         /// <summary>
-        /// Gets the view model for the URL tab.
+        /// Initial URL for the dialog.
         /// </summary>
-        IRepositoryUrlViewModel UrlTab { get; }
+        UriString Url { get; set; }
 
         /// <summary>
         /// Gets the path to clone the repository to.

src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryCloneViewModel.cs

@@ -90,9 +90,6 @@ public class MeasuresModel
             public int ExecuteToggleInlineCommentMarginCommand { get; set; }
             public int NumberOfPullRequestFileMarginToggleInlineCommentMargin { get; set; }
             public int NumberOfPullRequestFileMarginViewChanges { get; set; }
-            public int NumberOfCloneViewGitHubTab { get; set; }
-            public int NumberOfCloneViewEnterpriseTab { get; set; }
-            public int NumberOfCloneViewUrlTab { get; set; }
             public int NumberOfGitHubClones { get; set; }
             public int NumberOfEnterpriseClones { get; set; }
             public int NumberOfGitHubOpens { get; set; }

src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryUrlViewModel.cs

@@ -10,7 +10,7 @@
     <d:DesignData.DataContext>
         <ghfvs:RepositoryCloneViewModelDesigner/>
     </d:DesignData.DataContext>
-    
+
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -70,21 +70,6 @@
                      Visibility="{Binding EnterpriseTab.IsEnabled, Converter={ghfvs:BooleanToVisibilityConverter}}">
                 <local:SelectPageView DataContext="{Binding EnterpriseTab}"/>
             </TabItem>
-            <TabItem Header="URL" Style="{DynamicResource LightModalViewTabItem}">
-                <DockPanel DataContext="{Binding UrlTab}"
-                           LastChildFill="False"
-                           Margin="8">
-                    <TextBlock DockPanel.Dock="Top">
-                        Repository URL or GitHub username and repository
-                        <LineBreak/>
-                        (<Run Background="#66d3d3d3" FontFamily="Consolas">hubot/cool-repo</Run>)
-                    </TextBlock>
-                    <ghfvs:PromptTextBox DockPanel.Dock="Top"
-                                         Margin="0 4"
-                                         PromptText="URL or username/repository"
-                                         Text="{Binding Url, UpdateSourceTrigger=PropertyChanged}"/>
-                </DockPanel>
-            </TabItem>
         </TabControl>
     </DockPanel>
 </UserControl>

src/GitHub.Exports/Models/UsageModel.cs

@@ -23,7 +23,7 @@
     <DockPanel>
         <ghfvs:PromptTextBox DockPanel.Dock="Top"
                              Margin="0,4"
-                             PromptText="Filter"
+                             PromptText="Search or enter a URL"
                              Text="{Binding Filter, UpdateSourceTrigger=PropertyChanged, Delay=300}"/>
 
         <Grid>