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

Commit 8d2323a

Browse files
Merge branch 'features/check-suite-annotations' into features/check-suite-annotations-inline
2 parents b494b6e + f89c55b commit 8d2323a

File tree

47 files changed

+1483
-1196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1483
-1196
lines changed

GitHubVS.sln

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Wpf", "submodule
133133
EndProject
134134
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallAndStart", "test\Launcher\InstallAndStart.csproj", "{79F32BE1-2764-4DBA-97F6-21053DE44270}"
135135
EndProject
136+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.16", "src\GitHub.TeamFoundation.16\GitHub.TeamFoundation.16.csproj", "{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}"
137+
EndProject
136138
Global
137139
GlobalSection(SolutionConfigurationPlatforms) = preSolution
138140
Debug|Any CPU = Debug|Any CPU
@@ -542,6 +544,16 @@ Global
542544
{79F32BE1-2764-4DBA-97F6-21053DE44270}.Release|Any CPU.Build.0 = Release|Any CPU
543545
{79F32BE1-2764-4DBA-97F6-21053DE44270}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
544546
{79F32BE1-2764-4DBA-97F6-21053DE44270}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
547+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
548+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
549+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
550+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
551+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
552+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugWithoutVsix|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
553+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
554+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Release|Any CPU.Build.0 = Release|Any CPU
555+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
556+
{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
545557
EndGlobalSection
546558
GlobalSection(SolutionProperties) = preSolution
547559
HideSolutionNode = FALSE
1.39 MB
Binary file not shown.
698 KB
Binary file not shown.
1.09 MB
Binary file not shown.
36.8 KB
Binary file not shown.
1.66 MB
Binary file not shown.
552 KB
Binary file not shown.

src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Collections.ObjectModel;
1+
using System.Collections.Generic;
42
using System.Diagnostics.CodeAnalysis;
5-
using System.Reactive;
6-
using GitHub.InlineReviews.ViewModels;
3+
using System.Threading.Tasks;
74
using GitHub.Models;
85
using GitHub.ViewModels;
96
using ReactiveUI;
107

118
namespace GitHub.SampleData
129
{
1310
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
14-
public class CommentThreadViewModelDesigner : ICommentThreadViewModel
11+
public class CommentThreadViewModelDesigner : ViewModelBase, ICommentThreadViewModel
1512
{
1613
public CommentThreadViewModelDesigner()
1714
{
@@ -67,24 +64,24 @@ public CommentThreadViewModelDesigner()
6764
new InlineAnnotationViewModel(new InlineAnnotationModel(checkSuiteModel, checkRunModel, checkRunAnnotationModel3)),
6865
};
6966

70-
Comments = new ObservableCollection<ICommentViewModel>(){new CommentViewModelDesigner()
67+
Comments = new ReactiveList<ICommentViewModel>(){new CommentViewModelDesigner()
7168
{
7269
Author = new ActorViewModel{ Login = "shana"},
7370
Body = "You can use a `CompositeDisposable` type here, it's designed to handle disposables in an optimal way (you can just call `Dispose()` on it and it will handle disposing everything it holds)."
7471
}};
7572

7673
}
7774

78-
public ObservableCollection<ICommentViewModel> Comments { get; }
79-
= new ObservableCollection<ICommentViewModel>();
75+
public IReadOnlyReactiveList<ICommentViewModel> Comments { get; }
76+
= new ReactiveList<ICommentViewModel>();
8077

8178
public IReadOnlyList<IInlineAnnotationViewModel> Annotations { get; }
8279

8380
public IActorViewModel CurrentUser { get; set; }
8481
= new ActorViewModel { Login = "shana" };
8582

86-
public ReactiveCommand<string, Unit> PostComment { get; }
87-
public ReactiveCommand<Tuple<string, string>, Unit> EditComment { get; }
88-
public ReactiveCommand<Tuple<int, int>, Unit> DeleteComment { get; }
83+
public Task DeleteComment(int pullRequestId, int commentId) => Task.CompletedTask;
84+
public Task EditComment(string id, string body) => Task.CompletedTask;
85+
public Task PostComment(string body) => Task.CompletedTask;
8986
}
9087
}

src/GitHub.App/SampleData/CommentViewModelDesigner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public CommentViewModelDesigner()
2424
public bool IsSubmitting { get; set; }
2525
public bool CanDelete { get; } = true;
2626
public ICommentThreadViewModel Thread { get; }
27-
public DateTimeOffset UpdatedAt => DateTime.Now.Subtract(TimeSpan.FromDays(3));
27+
public DateTimeOffset CreatedAt => DateTime.Now.Subtract(TimeSpan.FromDays(3));
2828
public IActorViewModel Author { get; set; }
2929
public Uri WebUrl { get; }
3030

src/GitHub.App/SampleData/InlineAnnotationViewModelDesigner.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Collections.Generic;
2-
using GitHub.InlineReviews.ViewModels;
32
using GitHub.Models;
43
using GitHub.ViewModels;
54

0 commit comments

Comments
 (0)