Fix UI for closed PRs.

grokys · grokys · commit 6165f30f6367 · 2018-11-05T16:40:52.000+01:00
diff --git a/src/GitHub.App/ViewModels/Documents/IIssueishCommentViewModel.cs b/src/GitHub.App/ViewModels/Documents/IIssueishCommentViewModel.cs
@@ -11,35 +11,41 @@ namespace GitHub.ViewModels.Documents
     public interface IIssueishCommentViewModel : ICommentViewModel
     {
         /// <summary>
-        /// Gets a value indicating whether the comment will show a 
-        /// a button for <see cref="CloseIssueish"/>.
+        /// Gets a value indicating whether the comment will show a button for
+        /// <see cref="CloseOrReopen"/>.
         /// </summary>
-        bool CanCloseIssueish { get; }
+        bool CanCloseOrReopen { get; }
 
         /// <summary>
-        /// Gets a a caption for the <see cref="CloseIssueish"/> command.
+        /// Gets a a caption for the <see cref="CloseOrReopen"/> command.
         /// </summary>
-        string CloseIssueishCaption { get; }
+        string CloseOrReopenCaption { get; }
 
         /// <summary>
-        /// Gets a command which when executed will close the issue or pull request.
+        /// Gets a command which when executed will close the issue or pull request if it is open,
+        /// or reopen it if it is closed.
         /// </summary>
-        ReactiveCommand<Unit, Unit> CloseIssueish { get; }
+        ReactiveCommand<Unit, Unit> CloseOrReopen { get; }
 
         /// <summary>
         /// Initializes the view model with data.
         /// </summary>
         /// <param name="thread">The thread that the comment is a part of.</param>
         /// <param name="currentUser">The current user.</param>
         /// <param name="comment">The comment model. May be null.</param>
-        /// <param name="closeCaption">
-        /// The caption for the <see cref="CloseIssueish"/> command, or null if the user cannot
-        /// close the issue/pr from this comment.
+        /// <param name="isPullRequest">
+        /// true if the comment is on a pull request, false if the comment is on an issue.
+        /// </param>
+        /// <param name="isOpen">Whether the issue or pull request is open.</param>
+        /// <param name="canCloseOrReopen">
+        /// Whether the user can close or reopen the pull request from this comment.
         /// </param>
         Task InitializeAsync(
             IIssueishCommentThreadViewModel thread,
             ActorModel currentUser,
             CommentModel comment,
-            string closeCaption);
+            bool isPullRequest,
+            bool isOpen,
+            bool canCloseOrReopen);
     }
 }
diff --git a/src/GitHub.App/ViewModels/Documents/IssueishCommentViewModel.cs b/src/GitHub.App/ViewModels/Documents/IssueishCommentViewModel.cs
@@ -16,7 +16,7 @@ namespace GitHub.ViewModels.Documents
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public class IssueishCommentViewModel : CommentViewModel, IIssueishCommentViewModel
     {
-        ObservableAsPropertyHelper<string> closeIssueishCaption;
+        ObservableAsPropertyHelper<string> closeOrReopenCaption;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
@@ -26,26 +26,28 @@ public class IssueishCommentViewModel : CommentViewModel, IIssueishCommentViewMo
         public IssueishCommentViewModel(ICommentService commentService)
             : base(commentService)
         {
-            CloseIssueish = ReactiveCommand.CreateFromTask(
-                DoCloseIssueish,
-                this.WhenAnyValue(x => x.CanCloseIssueish));
+            CloseOrReopen = ReactiveCommand.CreateFromTask(
+                DoCloseOrReopen,
+                this.WhenAnyValue(x => x.CanCloseOrReopen));
         }
 
         /// <inheritdoc/>
-        public bool CanCloseIssueish { get; private set; }
+        public bool CanCloseOrReopen { get; private set; }
 
         /// <inheritdoc/>
-        public string CloseIssueishCaption => closeIssueishCaption?.Value;
+        public string CloseOrReopenCaption => closeOrReopenCaption?.Value;
 
         /// <inheritdoc/>
-        public ReactiveCommand<Unit, Unit> CloseIssueish { get; }
+        public ReactiveCommand<Unit, Unit> CloseOrReopen { get; }
 
         /// <inheritdoc/>
         public async Task InitializeAsync(
             IIssueishCommentThreadViewModel thread,
             ActorModel currentUser,
             CommentModel comment,
-            string closeCaption)
+            bool isPullRequest,
+            bool isOpen,
+            bool canCloseOrReopen)
         {
             await base.InitializeAsync(
                 thread,
@@ -54,17 +56,26 @@ await base.InitializeAsync(
                 comment == null ? CommentEditState.Editing : CommentEditState.None)
                     .ConfigureAwait(true);
 
-            CanCloseIssueish = closeCaption != null;
+            CanCloseOrReopen = canCloseOrReopen;
+            closeOrReopenCaption?.Dispose();
 
-            if (closeCaption != null)
+            if (canCloseOrReopen)
             {
-                closeIssueishCaption = this.WhenAnyValue(x => x.Body)
-                    .Select(x => string.IsNullOrWhiteSpace(x) ? closeCaption : Resources.CloseAndComment)
-                    .ToProperty(this, x => x.CloseIssueishCaption);
+                var caption = isPullRequest ?
+                    isOpen ?
+                        (Resources.ClosePullRequest, Resources.CloseAndComment) :
+                        (Resources.ReopenPullRequest, Resources.ReopenAndComment) :
+                    isOpen ?
+                        (Resources.CloseIssue, Resources.CloseAndComment) :
+                        (Resources.ReopenIssue, Resources.ReopenAndComment);
+
+                closeOrReopenCaption = this.WhenAnyValue(x => x.Body)
+                    .Select(x => string.IsNullOrWhiteSpace(x) ? caption.Item1 : caption.Item2)
+                    .ToProperty(this, x => x.CloseOrReopenCaption);
             }
         }
 
-        Task DoCloseIssueish()
+        Task DoCloseOrReopen()
         {
             return Task.CompletedTask;
         }
diff --git a/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs b/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs
@@ -129,7 +129,13 @@ Task IIssueishCommentThreadViewModel.CloseIssueish(ICommentViewModel comment)
         async Task AddComment(CommentModel comment)
         {
             var vm = factory.CreateViewModel<IIssueishCommentViewModel>();
-            await vm.InitializeAsync(this, currentUserModel, comment, null).ConfigureAwait(true);
+            await vm.InitializeAsync(
+                this,
+                currentUserModel,
+                comment,
+                true,
+                State == PullRequestState.Open,
+                false).ConfigureAwait(true);
             timeline.Add(vm);
         }
 
@@ -140,7 +146,9 @@ await placeholder.InitializeAsync(
                 this,
                 currentUserModel,
                 null,
-                Resources.ClosePullRequest).ConfigureAwait(true);
+                true,
+                State == PullRequestState.Open,
+                true).ConfigureAwait(true);
             timeline.Add(placeholder);
         }
 
diff --git a/src/GitHub.App/ViewModels/PullRequestViewModelBase.cs b/src/GitHub.App/ViewModels/PullRequestViewModelBase.cs
@@ -56,6 +56,7 @@ protected virtual async Task InitializeAsync(
 
             var fork = model.BaseRepositoryOwner != model.HeadRepositoryOwner;
             LocalRepository = localRepository;
+            State = model.State;
             SourceBranchDisplayName = GetBranchDisplayName(fork, model.HeadRepositoryOwner, model.HeadRefName);
             TargetBranchDisplayName = GetBranchDisplayName(fork, model.BaseRepositoryOwner, model.BaseRefName);
         }
diff --git a/src/GitHub.Resources/Resources.Designer.cs b/src/GitHub.Resources/Resources.Designer.cs
diff --git a/src/GitHub.Resources/Resources.resx b/src/GitHub.Resources/Resources.resx
@@ -851,4 +851,13 @@ https://git-scm.com/download/win</value>
   <data name="CloseAndComment" xml:space="preserve">
     <value>Close and comment</value>
   </data>
+  <data name="ReopenAndComment" xml:space="preserve">
+    <value>Reopen and comment</value>
+  </data>
+  <data name="ReopenIssue" xml:space="preserve">
+    <value>Reopen issue</value>
+  </data>
+  <data name="ReopenPullRequest" xml:space="preserve">
+    <value>Reopen pull request</value>
+  </data>
 </root>
diff --git a/src/GitHub.VisualStudio.UI/Views/CommentView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml
@@ -221,9 +221,9 @@
                         Content="{x:Static ghfvs:Resources.StartAReview}"
                         Visibility="{Binding CanStartReview, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}"/>
                 <Button Margin="4 0 0 0"
-                        Command="{Binding CloseIssueish}"
-                        Content="{Binding CloseIssueishCaption}"
-                        Visibility="{Binding CanCloseIssueish, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}"/>
+                        Command="{Binding CloseOrReopen}"
+                        Content="{Binding CloseOrReopenCaption}"
+                        Visibility="{Binding CanCloseOrReopen, Converter={ui:BooleanToVisibilityConverter}, FallbackValue=Collapsed}"/>
                 <Button Margin="4 0 0 0"
                         Command="{Binding CancelEdit}"
                         Content="{x:Static ghfvs:Resources.Cancel}"
diff --git a/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml b/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml
@@ -49,9 +49,7 @@
             <StackPanel Grid.Row="1" Orientation="Horizontal">
                 <TextBlock >
                     <InlineUIContainer BaselineAlignment="Bottom">
-                        <Border Background="#6CC644" CornerRadius="2" Padding="6,0,6,2" Margin="0,0,2,-2">
-                            <TextBlock FontWeight="Bold" Foreground="White" Text="{Binding State}"/>
-                        </Border>
+                        <v:IssueishStateBadge DataContext="{Binding State}" Margin="0,0,0,-2"/>
                     </InlineUIContainer>
                     <InlineUIContainer BaselineAlignment="TextBottom">
                         <v:ActorAvatarView ViewModel="{Binding Author}" Width="14" Height="14"/>
diff --git a/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml
@@ -46,22 +46,6 @@
                 <Setter Property="Fill" Value="{DynamicResource GitHubHeaderSeparatorBrush}"/>
             </Style>
 
-            <!-- TODO Fix this: here we change the color of TextBlock depending on the label.
-                 It's a hack, it will break with localization -->
-            <Style x:Key="StateIndicator" TargetType="TextBlock">
-                <Style.Triggers>
-                    <Trigger Property="Text" Value="OPEN">
-                        <Setter Property="Foreground" Value="#6CC644"/>
-                    </Trigger>
-                    <Trigger Property="Text" Value="CLOSED">
-                        <Setter Property="Foreground" Value="#BD2C00"/>
-                    </Trigger>
-                    <Trigger Property="Text" Value="MERGED">
-                        <Setter Property="Foreground" Value="#6E5494"/>
-                    </Trigger>
-                </Style.Triggers>
-            </Style>
-
             <Style x:Key="CheckoutMessage" TargetType="TextBlock">
                 <Setter Property="Margin" Value="0 4"/>
             </Style>
@@ -91,10 +75,7 @@
 
             <!-- State and branches -->
             <StackPanel Orientation="Horizontal">
-                <TextBlock FontWeight="Bold"
-                           VerticalAlignment="Center"
-                           Text="{Binding Model.State, Converter={StaticResource AllCaps}}"
-                           Style="{StaticResource StateIndicator}"/>
+                <v:IssueishStateBadge DataContext="{Binding Model.State}" VerticalAlignment="Center"/>
 
                 <Rectangle Margin="9 0" Width="1" Height="12" VerticalAlignment="Center" Style="{DynamicResource Separator}" />
 
diff --git a/src/GitHub.VisualStudio.UI/Views/IssueishStateBadge.xaml b/src/GitHub.VisualStudio.UI/Views/IssueishStateBadge.xaml
@@ -0,0 +1,33 @@
+﻿<UserControl x:Class="GitHub.VisualStudio.Views.IssueishStateBadge"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:models="clr-namespace:GitHub.Models;assembly=GitHub.Exports"
+             mc:Ignorable="d">
+    <d:DesignData.DataContext>
+        <models:PullRequestState>Open</models:PullRequestState>
+    </d:DesignData.DataContext>
+    
+    <Border CornerRadius="2" Padding="6,2">
+        <Border.Style>
+            <Style TargetType="Border">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding}" Value="Open">
+                        <Setter Property="Background" Value="#6CC644"/>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding}" Value="Closed">
+                        <Setter Property="Background" Value="#BD2C00"/>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding}" Value="Merged">
+                        <Setter Property="Background" Value="#6E5494"/>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </Border.Style>
+        <TextBlock FontWeight="Bold"
+                   Foreground="White"
+                   Text="{Binding}"
+                   VerticalAlignment="Center"/>
+    </Border>
+</UserControl>
diff --git a/src/GitHub.VisualStudio.UI/Views/IssueishStateBadge.xaml.cs b/src/GitHub.VisualStudio.UI/Views/IssueishStateBadge.xaml.cs
@@ -0,0 +1,12 @@
+﻿using System.Windows.Controls;
+
+namespace GitHub.VisualStudio.Views
+{
+    public partial class IssueishStateBadge : UserControl
+    {
+        public IssueishStateBadge()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/test/GitHub.App.UnitTests/ViewModels/Documents/IssueishCommentViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/Documents/IssueishCommentViewModelTests.cs
@@ -10,30 +10,30 @@ namespace GitHub.App.UnitTests.ViewModels.Documents
     public class IssueishCommentViewModelTests
     {
         [Test]
-        public async Task CloseIssueishCaption_Is_Set_When_Body_Empty()
+        public async Task CloseOrReopenCaption_Is_Set_When_Body_Empty()
         {
             var target = await CreateAndInitializeTarget(
                 new CommentModel(),
-                "Close issue");
+                canCloseOrReopen: true);
 
-            Assert.That(target.CloseIssueishCaption, Is.EqualTo("Close issue"));
+            Assert.That(target.CloseOrReopenCaption, Is.EqualTo("Close issue"));
         }
 
         [Test]
-        public async Task CommitCaption_Is_Update_When_Body_Not_Empty()
+        public async Task CloseOrReopenCaption_Is_Updated_When_Body_Not_Empty()
         {
             var target = await CreateAndInitializeTarget(
                 new CommentModel(),
-                "Close issue");
+                canCloseOrReopen: true);
 
             target.Body = "Body";
 
-            Assert.That(target.CloseIssueishCaption, Is.EqualTo("Close and comment"));
+            Assert.That(target.CloseOrReopenCaption, Is.EqualTo("Close and comment"));
         }
 
         async Task<IssueishCommentViewModel> CreateAndInitializeTarget(
             CommentModel comment,
-            string closeCaption,
+            bool canCloseOrReopen = false,
             ICommentService commentService = null,
             IIssueishCommentThreadViewModel thread = null,
             ActorModel currentUser = null)
@@ -46,7 +46,9 @@ await target.InitializeAsync(
                 thread,
                 currentUser,
                 comment,
-                closeCaption);
+                false,
+                true,
+                canCloseOrReopen);
             return target;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ protected virtual async Task InitializeAsync(`
`56`	`56`
`57`	`57`	`var fork = model.BaseRepositoryOwner != model.HeadRepositoryOwner;`
`58`	`58`	`LocalRepository = localRepository;`
	`59`	`+ State = model.State;`
`59`	`60`	`SourceBranchDisplayName = GetBranchDisplayName(fork, model.HeadRepositoryOwner, model.HeadRefName);`
`60`	`61`	`TargetBranchDisplayName = GetBranchDisplayName(fork, model.BaseRepositoryOwner, model.BaseRefName);`
`61`	`62`	`}`