Merge branch 'refactor/pr-models' into refactor/pr-list

Author: grokys

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.5.3.{build}'
+version: '2.5.4.{build}'
 skip_tags: true
 install:
 - ps: |

src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs

@@ -25,7 +25,7 @@ public class CommentViewModel : ReactiveObject, ICommentViewModel
         CommentEditState state;
         DateTimeOffset updatedAt;
         string undoBody;
-        bool canDelete;
+        ObservableAsPropertyHelper<bool> canDelete;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
@@ -60,13 +60,13 @@ protected CommentViewModel(
             UpdatedAt = updatedAt;
             WebUrl = webUrl;
 
-            var canDelete = this.WhenAnyValue(
+            var canDeleteObservable = this.WhenAnyValue(
                 x => x.EditState,
                 x => x == CommentEditState.None && author.Login == currentUser.Login);
 
-            canDelete.ToProperty(this, x => x.CanDelete);
+            canDelete = canDeleteObservable.ToProperty(this, x => x.CanDelete);
 
-            Delete = ReactiveCommand.CreateAsyncTask(canDelete, DoDelete);
+            Delete = ReactiveCommand.CreateAsyncTask(canDeleteObservable, DoDelete);
 
             var canEdit = this.WhenAnyValue(
                 x => x.EditState,
@@ -144,6 +144,7 @@ void DoBeginEdit(object unused)
         {
             if (state != CommentEditState.Editing)
             {
+                ErrorMessage = null;
                 undoBody = Body;
                 EditState = CommentEditState.Editing;
             }
@@ -228,8 +229,7 @@ public bool IsSubmitting
 
         public bool CanDelete
         {
-            get { return canDelete; }
-            private set { this.RaiseAndSetIfChanged(ref canDelete, value); }
+            get { return canDelete.Value; }
         }
 
         /// <inheritdoc/>

src/GitHub.InlineReviews/Views/CommentView.xaml

@@ -94,6 +94,23 @@
                                     Margin="0 2 0 0"
                                     Foreground="{DynamicResource VsBrush.WindowText}"
                                     Markdown="{Binding Body}"/>
+
+            <DockPanel Grid.Column="1" Grid.Row="2"
+                       Margin="0 4"
+                       HorizontalAlignment="Left" 
+                       TextBlock.Foreground="Red">
+                <DockPanel.Style>
+                    <Style TargetType="FrameworkElement">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ErrorMessage}" Value="{x:Null}">
+                                <Setter Property="Visibility" Value="Collapsed"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </DockPanel.Style>
+                <ui:OcticonImage DockPanel.Dock="Left" Icon="alert" Margin="0 0 4 0"/>
+                <TextBlock Text="{Binding ErrorMessage}" TextWrapping="Wrap"/>
+            </DockPanel>
         </StackPanel>
 
         <!-- Displays edit view or a reply placeholder-->

src/GitHub.VisualStudio/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.5.3.0" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.5.4.0" Language="en-US" Publisher="GitHub, Inc" />
     <DisplayName>GitHub Extension for Visual Studio</DisplayName>
     <Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
     <PackageId>GitHub.VisualStudio</PackageId>
@@ -39,4 +39,4 @@
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25824.0,16.0)" DisplayName="Visual Studio core editor" />
   </Prerequisites>
-</PackageManifest>
+</PackageManifest>

src/common/SolutionInfo.cs

@@ -18,6 +18,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.5.3.0";
+        internal const string Version = "2.5.4.0";
     }
 }

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionTests.cs

@@ -18,6 +18,7 @@ namespace GitHub.InlineReviews.UnitTests.Services
     public class PullRequestSessionTests
     {
         const int PullRequestNumber = 5;
+        const string PullRequestNodeId = "pull_request_id";
         const string RepoUrl = "https://foo.bar/owner/repo";
         const string FilePath = "test.cs";