feature: add Move to Workspace context menu entry for repository tab in main tab bar (#1968)

This commit also changes the behavior of opening a repository from CLI. Now, `SourceGit` will always open the last actived workspace first and then open the target repository specified from CLI if it is needed

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Resources/Locales/en_US.axaml

@@ -551,6 +551,7 @@
   <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">Close Other Tabs</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseRight" xml:space="preserve">Close Tabs to the Right</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Copy Repository Path</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.MoveToWorkspace" xml:space="preserve">Move to Workspace</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Refresh" xml:space="preserve">Refresh</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Repositories</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Paste</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -555,6 +555,7 @@
   <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">关闭其他标签页</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseRight" xml:space="preserve">关闭右侧标签页</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">复制仓库路径</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.MoveToWorkspace" xml:space="preserve">移至工作区</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Refresh" xml:space="preserve">刷新</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">新标签页</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">粘贴</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -555,6 +555,7 @@
   <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">關閉其他分頁</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseRight" xml:space="preserve">關閉右側分頁</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">複製存放庫路徑</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.MoveToWorkspace" xml:space="preserve">移至工作區</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Refresh" xml:space="preserve">重新整理</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">新分頁</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">貼上</x:String>

src/ViewModels/Launcher.cs

@@ -35,13 +35,7 @@ public LauncherPage ActivePage
             set
             {
                 if (SetProperty(ref _activePage, value))
-                {
-                    CancelCommandPalette();
-                    UpdateTitle();
-
-                    if (!_ignoreIndexChange && value is { Data: Repository repo })
-                        _activeWorkspace.ActiveIdx = _activeWorkspace.Repositories.IndexOf(repo.FullPath);
-                }
+                    PostActivePageChanged(value?.Data as Repository);
             }
         }
 
@@ -59,64 +53,43 @@ public Launcher(string startupRepo)
             AddNewTab();
 
             var pref = Preferences.Instance;
-            if (string.IsNullOrEmpty(startupRepo))
-            {
-                ActiveWorkspace = pref.GetActiveWorkspace();
+            ActiveWorkspace = pref.GetActiveWorkspace();
 
-                var repos = ActiveWorkspace.Repositories.ToArray();
-                foreach (var repo in repos)
-                {
-                    var node = pref.FindNode(repo) ??
-                        new RepositoryNode
-                        {
-                            Id = repo,
-                            Name = Path.GetFileName(repo),
-                            Bookmark = 0,
-                            IsRepository = true,
-                        };
-
-                    OpenRepositoryInTab(node, null);
-                }
+            var repos = ActiveWorkspace.Repositories.ToArray();
+            foreach (var repo in repos)
+            {
+                var node = pref.FindNode(repo) ??
+                    new RepositoryNode
+                    {
+                        Id = repo,
+                        Name = Path.GetFileName(repo),
+                        Bookmark = 0,
+                        IsRepository = true,
+                    };
 
-                var activeIdx = ActiveWorkspace.ActiveIdx;
-                if (activeIdx >= 0 && activeIdx < Pages.Count)
-                {
-                    ActivePage = Pages[activeIdx];
-                }
-                else
-                {
-                    ActivePage = Pages[0];
-                    ActiveWorkspace.ActiveIdx = 0;
-                }
+                OpenRepositoryInTab(node, null);
             }
-            else
-            {
-                ActiveWorkspace = new Workspace() { Name = "Unnamed" };
 
-                foreach (var w in pref.Workspaces)
-                    w.IsActive = false;
+            _ignoreIndexChange = false;
 
+            if (!string.IsNullOrEmpty(startupRepo))
+            {
                 var test = new Commands.QueryRepositoryRootPath(startupRepo).GetResult();
-                if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
-                {
-                    Pages[0].Notifications.Add(new Models.Notification
-                    {
-                        IsError = true,
-                        Message = $"Given path: '{startupRepo}' is NOT a valid repository!"
-                    });
-                }
-                else
+                if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
                 {
                     var node = pref.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false);
                     Welcome.Instance.Refresh();
+
                     OpenRepositoryInTab(node, null);
+                    return;
                 }
             }
 
-            _ignoreIndexChange = false;
-
-            if (string.IsNullOrEmpty(_title))
-                UpdateTitle();
+            var activeIdx = ActiveWorkspace.ActiveIdx;
+            if (activeIdx >= 0 && activeIdx < Pages.Count)
+                ActivePage = Pages[activeIdx];
+            else
+                ActivePage = Pages[0];
         }
 
         public void Quit()
@@ -173,18 +146,14 @@ public void SwitchWorkspace(Workspace to)
                 OpenRepositoryInTab(node, null);
             }
 
+            _ignoreIndexChange = false;
+
             var activeIdx = to.ActiveIdx;
             if (activeIdx >= 0 && activeIdx < Pages.Count)
-            {
                 ActivePage = Pages[activeIdx];
-            }
             else
-            {
                 ActivePage = Pages[0];
-                to.ActiveIdx = 0;
-            }
 
-            _ignoreIndexChange = false;
             Preferences.Instance.Save();
             GC.Collect();
         }
@@ -203,17 +172,16 @@ public void MoveTab(LauncherPage from, LauncherPage to)
             var fromIdx = Pages.IndexOf(from);
             var toIdx = Pages.IndexOf(to);
             Pages.Move(fromIdx, toIdx);
-            ActivePage = from;
 
-            ActiveWorkspace.Repositories.Clear();
+            _activeWorkspace.Repositories.Clear();
             foreach (var p in Pages)
             {
                 if (p.Data is Repository r)
-                    ActiveWorkspace.Repositories.Add(r.FullPath);
+                    _activeWorkspace.Repositories.Add(r.FullPath);
             }
-            ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(from.Node.Id);
 
             _ignoreIndexChange = false;
+            ActivePage = from;
         }
 
         public void GotoNextTab()
@@ -243,8 +211,8 @@ public void CloseTab(LauncherPage page)
                 var last = Pages[0];
                 if (last.Data is Repository repo)
                 {
-                    ActiveWorkspace.Repositories.Clear();
-                    ActiveWorkspace.ActiveIdx = 0;
+                    _activeWorkspace.Repositories.Clear();
+                    _activeWorkspace.ActiveIdx = 0;
 
                     repo.Close();
 
@@ -253,9 +221,8 @@ public void CloseTab(LauncherPage page)
                     last.Data = Welcome.Instance;
                     last.Popup?.Cleanup();
                     last.Popup = null;
-                    UpdateTitle();
 
-                    CancelCommandPalette();
+                    PostActivePageChanged(null);
                     GC.Collect();
                 }
                 else
@@ -293,9 +260,9 @@ public void CloseOtherTabs()
             }
 
             Pages = new AvaloniaList<LauncherPage> { ActivePage };
-            ActiveWorkspace.ActiveIdx = 0;
             OnPropertyChanged(nameof(Pages));
 
+            _activeWorkspace.ActiveIdx = 0;
             _ignoreIndexChange = false;
             GC.Collect();
         }
@@ -345,14 +312,14 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
 
             if (page == null)
             {
-                if (ActivePage == null || ActivePage.Node.IsRepository)
+                if (_activePage == null || _activePage.Node.IsRepository)
                 {
                     page = new LauncherPage(node, repo);
                     Pages.Add(page);
                 }
                 else
                 {
-                    page = ActivePage;
+                    page = _activePage;
                     page.Node = node;
                     page.Data = repo;
                 }
@@ -363,20 +330,17 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
                 page.Data = repo;
             }
 
-            if (page != _activePage)
-                ActivePage = page;
-            else
-                UpdateTitle();
-
-            ActiveWorkspace.Repositories.Clear();
+            _activeWorkspace.Repositories.Clear();
             foreach (var p in Pages)
             {
                 if (p.Data is Repository r)
-                    ActiveWorkspace.Repositories.Add(r.FullPath);
+                    _activeWorkspace.Repositories.Add(r.FullPath);
             }
 
-            if (!_ignoreIndexChange)
-                ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(node.Id);
+            if (_activePage == page)
+                PostActivePageChanged(repo);
+            else
+                ActivePage = page;
         }
 
         public void OpenCommandPalette(ICommandPalette commandPalette)
@@ -388,9 +352,12 @@ public void OpenCommandPalette(ICommandPalette commandPalette)
 
         public void CancelCommandPalette()
         {
-            _commandPalette?.Dispose();
-            CommandPalette = null;
-            GC.Collect();
+            if (_commandPalette != null)
+            {
+                _commandPalette?.Dispose();
+                CommandPalette = null;
+                GC.Collect();
+            }
         }
 
         public void DispatchNotification(string pageId, string message, bool isError)
@@ -456,7 +423,7 @@ private void CloseRepositoryInTab(LauncherPage page, bool removeFromWorkspace =
             if (page.Data is Repository repo)
             {
                 if (removeFromWorkspace)
-                    ActiveWorkspace.Repositories.Remove(repo.FullPath);
+                    _activeWorkspace.Repositories.Remove(repo.FullPath);
 
                 repo.Close();
             }
@@ -466,8 +433,11 @@ private void CloseRepositoryInTab(LauncherPage page, bool removeFromWorkspace =
             page.Data = null;
         }
 
-        private void UpdateTitle()
+        private void PostActivePageChanged(Repository repo)
         {
+            if (_ignoreIndexChange)
+                return;
+
             var builder = new StringBuilder(512);
             if (_activeWorkspace != null)
             {
@@ -497,7 +467,11 @@ private void UpdateTitle()
                 builder.Append("Repositories");
             }
 
+            CancelCommandPalette();
             Title = builder.ToString();
+
+            if (repo != null)
+                _activeWorkspace.ActiveIdx = _activeWorkspace.Repositories.IndexOf(repo.FullPath);
         }
 
         private Workspace _activeWorkspace = null;

src/Views/LauncherTabBar.axaml.cs

@@ -334,6 +334,38 @@ private void OnTabContextRequested(object sender, ContextRequestedEventArgs e)
                         bookmark.Items.Add(setter);
                     }
                     menu.Items.Add(bookmark);
+
+                    var workspaces = ViewModels.Preferences.Instance.Workspaces;
+                    if (workspaces.Count > 1)
+                    {
+                        var moveTo = new MenuItem();
+                        moveTo.Header = App.Text("PageTabBar.Tab.MoveToWorkspace");
+                        moveTo.Icon = App.CreateMenuIcon("Icons.MoveTo");
+
+                        foreach (var ws in workspaces)
+                        {
+                            var dupWs = ws;
+                            var isCurrent = dupWs == vm.ActiveWorkspace;
+
+                            var target = new MenuItem();
+                            target.Header = ws.Name;
+                            target.Icon = App.CreateMenuIcon(isCurrent ? "Icons.Check" : "Icons.Workspace");
+                            target.Click += (_, ev) =>
+                            {
+                                if (!isCurrent)
+                                {
+                                    vm.CloseTab(page);
+                                    dupWs.Repositories.Add(repo.FullPath);
+                                }
+
+                                ev.Handled = true;
+                            };
+                            moveTo.Items.Add(target);
+                        }
+
+                        menu.Items.Add(moveTo);
+                    }
+
                     menu.Items.Add(new MenuItem() { Header = "-" });
                 }