Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Moved changed files tree into its own view. #1492

Merged
merged 4 commits into from
Mar 23, 2018
Merged

Moved changed files tree into its own view. #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f72df0c
Moved changed files tree into its own view.
grokys Feb 15, 2018
6123b02
Use the `ghfvs:` xmlns where possible.
grokys Mar 16, 2018
b203545
Port changes from #1407.
grokys Feb 15, 2018
44adbb3
Fix dark theme foreground color.
grokys Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 54 additions & 4 deletions src/GitHub.App/GitHub.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,16 @@
<HintPath>..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Editor, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Editor.14.3.25407\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
<HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand All @@ -74,21 +82,60 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61031\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30111\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
<HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
<HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down Expand Up @@ -152,11 +199,13 @@
<Compile Include="Models\IssueCommentModel.cs" />
<Compile Include="Models\PullRequestReviewCommentModel.cs" />
<Compile Include="Models\PullRequestDetailArgument.cs" />
<Compile Include="SampleData\PullRequestFilesViewModelDesigner.cs" />
<Compile Include="Services\EnterpriseCapabilitiesService.cs" />
<Compile Include="Services\GlobalConnection.cs" />
<Compile Include="Services\PullRequestEditorService.cs" />
<Compile Include="Services\TeamExplorerContext.cs" />
<Compile Include="Services\OAuthCallbackListener.cs" />
<Compile Include="Services\TextViewCommandDispatcher.cs" />
<Compile Include="ViewModels\Dialog\GistCreationViewModel.cs" />
<Compile Include="ViewModels\Dialog\GitHubDialogWindowViewModel.cs" />
<Compile Include="ViewModels\Dialog\LoginCredentialsViewModel.cs" />
Expand All @@ -172,6 +221,7 @@
<Compile Include="ViewModels\GitHubPane\LoggedOutViewModel.cs" />
<Compile Include="ViewModels\GitHubPane\NavigationViewModel.cs" />
<Compile Include="ViewModels\GitHubPane\GitHubPaneViewModel.cs" />
<Compile Include="ViewModels\GitHubPane\PullRequestFilesViewModel.cs" />
<Compile Include="ViewModels\GitHubPane\PullRequestListViewModel.cs" />
<Compile Include="ViewModels\GitHubPane\PanePageViewModelBase.cs" />
<Compile Include="ViewModels\GitHubPane\PullRequestDetailViewModel.cs" />
Expand Down
12 changes: 2 additions & 10 deletions src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public class PullRequestUpdateStateDesigner : IPullRequestUpdateState
[ExcludeFromCodeCoverage]
public class PullRequestDetailViewModelDesigner : PanePageViewModelBase, IPullRequestDetailViewModel
{
private List<IPullRequestChangeNode> changedFilesTree;

public PullRequestDetailViewModelDesigner()
{
var repoPath = @"C:\Repo";
Expand Down Expand Up @@ -69,8 +67,7 @@ public PullRequestDetailViewModelDesigner()
modelsDir.Files.Add(oldBranchModel);
gitHubDir.Directories.Add(modelsDir);

changedFilesTree = new List<IPullRequestChangeNode>();
changedFilesTree.Add(gitHubDir);
Files = new PullRequestFilesViewModelDesigner();
}

public IPullRequestModel Model { get; }
Expand All @@ -84,7 +81,7 @@ public PullRequestDetailViewModelDesigner()
public bool IsCheckedOut { get; }
public bool IsFromFork { get; }
public string Body { get; }
public IReadOnlyList<IPullRequestChangeNode> ChangedFilesTree => changedFilesTree;
public IPullRequestFilesViewModel Files { get; set; }
public IPullRequestCheckoutState CheckoutState { get; set; }
public IPullRequestUpdateState UpdateState { get; set; }
public string OperationError { get; set; }
Expand All @@ -94,12 +91,7 @@ public PullRequestDetailViewModelDesigner()
public ReactiveCommand<Unit> Checkout { get; }
public ReactiveCommand<Unit> Pull { get; }
public ReactiveCommand<Unit> Push { get; }
public ReactiveCommand<Unit> SyncSubmodules { get; }
public ReactiveCommand<object> OpenOnGitHub { get; }
public ReactiveCommand<object> DiffFile { get; }
public ReactiveCommand<object> DiffFileWithWorkingDirectory { get; }
public ReactiveCommand<object> OpenFileInWorkingDirectory { get; }
public ReactiveCommand<object> ViewFile { get; }

public Task InitializeAsync(ILocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int number) => Task.CompletedTask;

Expand Down
47 changes: 47 additions & 0 deletions src/GitHub.App/SampleData/PullRequestFilesViewModelDesigner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.Reactive;
using System.Threading.Tasks;
using GitHub.Models;
using GitHub.Services;
using GitHub.ViewModels.GitHubPane;
using ReactiveUI;

namespace GitHub.SampleData
{
public class PullRequestFilesViewModelDesigner : PanePageViewModelBase, IPullRequestFilesViewModel
{
public PullRequestFilesViewModelDesigner()
{
Items = new[]
{
new PullRequestDirectoryNode("src")
{
Files =
{
new PullRequestFileNode("x", "src/File1.cs", "x", PullRequestFileStatus.Added, null),
new PullRequestFileNode("x", "src/File2.cs", "x", PullRequestFileStatus.Modified, null),
new PullRequestFileNode("x", "src/File3.cs", "x", PullRequestFileStatus.Removed, null),
new PullRequestFileNode("x", "src/File4.cs", "x", PullRequestFileStatus.Renamed, "src/Old.cs"),
}
}
};
ChangedFilesCount = 4;
}

public int ChangedFilesCount { get; set; }
public IReadOnlyList<IPullRequestChangeNode> Items { get; }
public ReactiveCommand<Unit> DiffFile { get; }
public ReactiveCommand<Unit> ViewFile { get; }
public ReactiveCommand<Unit> DiffFileWithWorkingDirectory { get; }
public ReactiveCommand<Unit> OpenFileInWorkingDirectory { get; }
public ReactiveCommand<Unit> OpenFirstComment { get; }

public Task InitializeAsync(
IPullRequestSession session,
Func<IInlineCommentThreadModel, bool> commentFilter = null)
{
return Task.CompletedTask;
}
}
}
Loading