Remove Down Vote Button and Obsolete UI command (#9950)

QilongTang · web-flow · commit 2d265ed4d3ad · 2019-09-04T15:00:34.000-04:00
* Remove Down Vote Button and Obsolete UI command

* Remove Downvote tests
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1667,9 +1667,6 @@ Next assemblies were loaded several times:
     <value>Description</value>
     <comment>Package description</comment>
   </data>
-  <data name="PackageSearchViewDownvoteButtonTooltip" xml:space="preserve">
-    <value>Downvote to voice lack of support for this package</value>
-  </data>
   <data name="PackageSearchViewInstallButton" xml:space="preserve">
     <value>⇓ Install</value>
     <comment>To install package</comment>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -1308,9 +1308,6 @@ You will get a chance to save your work.</value>
     <value>Description</value>
     <comment>Package description</comment>
   </data>
-  <data name="PackageSearchViewDownvoteButtonTooltip" xml:space="preserve">
-    <value>Downvote to voice lack of support for this package</value>
-  </data>
   <data name="PackageSearchViewInstallButton" xml:space="preserve">
     <value>⇓ Install</value>
     <comment>To install package</comment>
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -435,8 +435,6 @@ public List<PackageManagerSearchElement> ListAll()
                 var ele = new PackageManagerSearchElement(header);
 
                 ele.UpvoteRequested += this.Model.Upvote;
-                ele.DownvoteRequested += this.Model.Downvote;
-
                 CachedPackageList.Add( ele );
             }
 
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
@@ -14,6 +14,8 @@ public class PackageManagerSearchElementViewModel : BrowserItemViewModel, IEquat
     {
         public ICommand DownloadLatestCommand { get; set; }
         public ICommand UpvoteCommand { get; set; }
+
+        [Obsolete("This UI command will no longer decrease package votes and will be removed in Dynamo 3.0")]
         public ICommand DownvoteCommand { get; set; }
         public ICommand VisitSiteCommand { get; set; }
         public ICommand VisitRepositoryCommand { get; set; }
@@ -31,6 +33,8 @@ public PackageManagerSearchElementViewModel(PackageManagerSearchElement element,
             this.DownloadLatestToCustomPathCommand = new DelegateCommand(() => OnRequestDownload(Model.Header.versions.Last(), true));
 
             this.UpvoteCommand = new DelegateCommand(Model.Upvote, () => canLogin);
+
+            // TODO: Remove the initialization of the UI command in Dynamo 3.0
             this.DownvoteCommand = new DelegateCommand(Model.Downvote, () => canLogin);
 
             this.VisitSiteCommand =
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -323,25 +323,18 @@
                                                 </StackPanel>
                                             </Button>
 
-                                            <StackPanel Width="55"  Orientation="Vertical" Margin="3,0,0,0">
-                                                <StackPanel Orientation="Horizontal">
+                                            <StackPanel Width="80"  Orientation="Vertical" Margin="3,0,0,0">
+                                                <StackPanel Orientation="Vertical">
                                                     <Button Name="UpvoteButton" 
                                                         FontSize="15" 
                                                         ToolTip="{x:Static p:Resources.PackageSearchViewUpvoteButtonTooltip}"  
                                                         Content="👍"
-                                                        Margin="0,0,8,0"
+                                                        Margin="0,0,0,0"
                                                         Foreground="Gray" 
                                                         Command="{Binding Path=UpvoteCommand}" 
                                                         Style="{StaticResource FlatButton}" />
-                                                    <Button Name="DownvoteButton" 
-                                                        FontSize="15" 
-                                                        ToolTip="{x:Static p:Resources.PackageSearchViewDownvoteButtonTooltip}" 
-                                                        Foreground="Gray" 
-                                                        Content="👎"  
-                                                        Command="{Binding Path=DownvoteCommand}" 
-                                                        Style="{StaticResource FlatButton}" />
+                                                    <TextBlock FontSize="10" TextAlignment="Center" Margin="0,0,0,0" Text="{Binding Path=Model.Votes}" Foreground="Gray"  />
                                                 </StackPanel>
-                                                <TextBlock FontSize="10" TextAlignment="Center" Margin="0,0,0,0" Text="{Binding Path=Model.Votes}" Foreground="Gray"  />
                                             </StackPanel>
                                         </StackPanel>
 
diff --git a/src/DynamoPackages/PackageManagerClient.cs b/src/DynamoPackages/PackageManagerClient.cs
@@ -57,15 +57,6 @@ internal bool Upvote(string packageId)
             }, false);
         }
 
-        internal bool Downvote(string packageId)
-        {
-            return FailFunc.TryExecute(() =>
-            {
-                var pkgResponse = this.client.ExecuteAndDeserialize(new Downvote(packageId));
-                return pkgResponse.success;
-            }, false);
-        }
-
         internal PackageManagerResult DownloadPackage(string packageId, string version, out string pathToPackage)
         {
             try
diff --git a/src/DynamoPackages/PackageManagerSearchElement.cs b/src/DynamoPackages/PackageManagerSearchElement.cs
@@ -26,6 +26,7 @@ public class PackageManagerSearchElement : SearchElementBase
         ///     An event that's invoked when the user has attempted to downvote this
         ///     package.
         /// </summary>
+        [Obsolete("This event will be removed in Dynamo 3.0")]
         public event Func<string, bool> DownvoteRequested;
 
         public string Maintainers { get { return String.Join(", ", this.Header.maintainers.Select(x => x.username)); } }
@@ -155,6 +156,7 @@ public void Upvote()
                 , TaskScheduler.FromCurrentSynchronizationContext());
         }
 
+        [Obsolete("This API will no longer decrease package votes and will be removed in Dynamo 3.0")]
         public void Downvote()
         {
             Task<bool>.Factory.StartNew(() => DownvoteRequested(this.Id))
diff --git a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
@@ -173,39 +173,6 @@ public void Upvote_ReturnsFalseWhenRequestThrowsException()
 
         #endregion
 
-        #region Downvote
-
-        [Test]
-        public void Downvote_ReturnsTrueWhenRequestSucceeds()
-        {
-            var gc = new Mock<IGregClient>();
-            gc.Setup(x => x.ExecuteAndDeserialize(It.IsAny<Downvote>())).Returns(new ResponseBody()
-            {
-                success = true
-            });
-
-            var pc = new PackageManagerClient(gc.Object, MockMaker.Empty<IPackageUploadBuilder>(), "");
-
-            var res = pc.Downvote("id");
-
-            Assert.IsTrue(res);
-        }
-
-        [Test]
-        public void Downvote_ReturnsFalseWhenRequestThrowsException()
-        {
-            var gc = new Mock<IGregClient>();
-            gc.Setup(x => x.ExecuteAndDeserialize(It.IsAny<Downvote>())).Throws<Exception>();
-
-            var pc = new PackageManagerClient(gc.Object, MockMaker.Empty<IPackageUploadBuilder>(), "");
-
-            var res = pc.Downvote("id");
-
-            Assert.IsFalse(res);
-        }
-
-        #endregion
-
         #region GetTermsOfUseAcceptanceStatus
 
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -435,8 +435,6 @@ public List<PackageManagerSearchElement> ListAll()`
`435`	`435`	`var ele = new PackageManagerSearchElement(header);`
`436`	`436`
`437`	`437`	`ele.UpvoteRequested += this.Model.Upvote;`
`438`		`- ele.DownvoteRequested += this.Model.Downvote;`
`439`		`-`
`440`	`438`	`CachedPackageList.Add( ele );`
`441`	`439`	`}`
`442`	`440`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class PackageManagerSearchElement : SearchElementBase`
`26`	`26`	`/// An event that's invoked when the user has attempted to downvote this`
`27`	`27`	`/// package.`
`28`	`28`	`/// </summary>`
	`29`	`+ [Obsolete("This event will be removed in Dynamo 3.0")]`
`29`	`30`	`public event Func<string, bool> DownvoteRequested;`
`30`	`31`
`31`	`32`	`public string Maintainers { get { return String.Join(", ", this.Header.maintainers.Select(x => x.username)); } }`
`@@ -155,6 +156,7 @@ public void Upvote()`
`155`	`156`	`, TaskScheduler.FromCurrentSynchronizationContext());`
`156`	`157`	`}`
`157`	`158`
	`159`	`+ [Obsolete("This API will no longer decrease package votes and will be removed in Dynamo 3.0")]`
`158`	`160`	`public void Downvote()`
`159`	`161`	`{`
`160`	`162`	`Task<bool>.Factory.StartNew(() => DownvoteRequested(this.Id))`