Pm search for packages - votes (#14390)

dnenov · web-flow · commit 8eee844e030c · 2023-10-26T21:33:29.000-04:00
* votes cherry pick - adding changes connected to the 'votes' behavior * Greg update - still not showing the new 'GetUserVotes' request that was added with this PR DynamoDS/PackageManagerClient#84 * votes cherry pick - voting for packages functionality reinstated - checking for user votes on loading - if the user has already voted for a package prevents from voting again - ui updates * minor fixes - now correctly updates the SeachElement item inside the PackageManagerPackagesControl 'votes' icon when user has voted for a package - now allows to vote for a package right after a package has been installed * Greg - Duplicate 'PackageReference' items found - removed duplicate package references * references reconciliation - reconciled meshed up references - comments * reference fix - last reference? * revert assemblyinfo changes - revert changes made by mistake * failing tests fix
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -259,6 +259,12 @@ public string Username
 
         public ICommand ToggleLoginStateCommand { get; private set; }
 
+        /// <summary>
+        /// Contains all votes the user has been submitted.
+        /// Will allow the user to vote for a package they have not upvoted before
+        /// </summary>
+        private List<string> Uservotes { get; set; }
+
         internal PackageManagerClientViewModel(DynamoViewModel dynamoViewModel, PackageManagerClient model )
         {
             this.DynamoViewModel = dynamoViewModel;
@@ -276,6 +282,11 @@ internal PackageManagerClientViewModel(DynamoViewModel dynamoViewModel, PackageM
                     RaisePropertyChanged("Username");
                 };
             }
+
+            if (AuthenticationManager.LoginState.Equals(LoginState.LoggedIn))
+            {
+                this.Uservotes = this.Model.UserVotes();
+            }
         }
 
         private void ToggleLoginState()
@@ -485,6 +496,11 @@ public List<PackageManagerSearchElement> ListAll()
                 var ele = new PackageManagerSearchElement(header);
 
                 ele.UpvoteRequested += this.Model.Upvote;
+                if (Uservotes != null)
+                {
+                    ele.HasUpvote = Uservotes.Contains(header._id);
+                }
+
                 CachedPackageList.Add( ele );
             }
 
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
@@ -154,18 +154,16 @@
                  SelectedIndex="{Binding Path=SelectedIndex}"
                  VirtualizingPanel.ScrollUnit="Pixel">
 
-            <ListBox.Resources>
+            <ListBox.Resources>                
+                <SolidColorBrush x:Key="ForegroundGrayBrush" Color="#D8D8D8" />
+                <SolidColorBrush x:Key="HasVotedBlueBrush" Color="#84D7CE" />   
                 <!--  Local style used for labels on result, e.g. Number of Installs  -->
                 <Style x:Key="resultLabelStyle"
                        TargetType="TextBlock">
-                    <Setter Property="FontFamily"
-                            Value="{StaticResource ArtifaktElementRegular}" />
-                    <Setter Property="FontSize"
-                            Value="10" />
-                    <Setter Property="Foreground"
-                            Value="#C7C7C7" />
-                    <Setter Property="VerticalAlignment"
-                            Value="Center" />
+                    <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}" />
+                    <Setter Property="FontSize" Value="10" />
+                    <Setter Property="Foreground" Value="#C7C7C7" />
+                    <Setter Property="VerticalAlignment" Value="Center" />
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding Model.IsDeprecated}"
                                      Value="True">
@@ -564,15 +562,19 @@
                                        DockPanel.Dock="Right"
                                        Style="{StaticResource resultLabelStyle}"
                                        Text="{Binding Path=Model.Votes, Converter={StaticResource NegativeIntToZeroConverter}}" />
-                            <Rectangle Width="12"
-                                       Height="11"
-                                       Margin="5,0,0,2"
-                                       VerticalAlignment="Center"
-                                       DockPanel.Dock="Right">
-                                <Rectangle.Fill>
-                                    <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Favorite.png" />
-                                </Rectangle.Fill>
-                            </Rectangle>
+                          
+
+                            <Viewbox Width="12"
+                                     Height="12"
+                                     Margin="5,0,0,2"
+                                     VerticalAlignment="Center"
+                                     DockPanel.Dock="Right">
+                                <Path x:Name="heartIcon"
+                                      Data="M13.91,6.75c-1.17,2.25-4.3,5.31-6.07,6.94c-0.1903,0.1718-0.4797,0.1718-0.67,0C5.39,12.06,2.26,9,1.09,6.75&#xA;&#x9;C-1.48,1.8,5-1.5,7.5,3.45C10-1.5,16.48,1.8,13.91,6.75z"
+                                      Stroke="{StaticResource ForegroundGrayBrush}"
+                                      StrokeThickness="1"
+                                      VerticalAlignment="Center" />
+                            </Viewbox>
 
                             <!-- The version combobox -->
                             <StackPanel Margin="5,0,5,0"
@@ -626,6 +628,17 @@
                                    Fill="{StaticResource DarkMidGreyBrush}" />
 
                     </Grid>
+                    <DataTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Path=Model.HasUpvote}"
+                                     Value="True">
+                            <Setter TargetName="heartIcon"
+                                    Property="Fill"
+                                    Value="{StaticResource HasVotedBlueBrush}" />
+                            <Setter TargetName="heartIcon"
+                                    Property="Stroke"
+                                    Value="{StaticResource HasVotedBlueBrush}" />
+                        </DataTrigger>
+                    </DataTemplate.Triggers>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
diff --git a/src/DynamoPackages/PackageManagerClient.cs b/src/DynamoPackages/PackageManagerClient.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Dynamo.Graph.Workspaces;
 using Greg;
 using Greg.Requests;
 using Greg.Responses;
-using System.Linq;
 
 namespace Dynamo.PackageManager
 {
@@ -65,6 +65,18 @@ internal bool Upvote(string packageId)
             }, false);
         }
 
+        internal List<string> UserVotes()
+        {
+            var votes = FailFunc.TryExecute(() =>
+            {
+                var nv = new GetUserVotes();
+                var pkgResponse = this.client.ExecuteAndDeserializeWithContent<UserVotes>(nv);
+                return pkgResponse.content;
+            }, null);
+
+            return votes.has_upvoted;
+        }
+
         internal PackageManagerResult DownloadPackage(string packageId, string version, out string pathToPackage)
         {
             try
diff --git a/src/DynamoPackages/PackageManagerSearchElement.cs b/src/DynamoPackages/PackageManagerSearchElement.cs
@@ -124,6 +124,25 @@ public string HostsString
         public string InfectedPackageVersion { get; set; }
         public string InfectedPackageCreationDate { get; set; }
 
+        private bool hasUpvote;
+        /// <summary>
+        ///     Shows if the current user has upvoted this package
+        /// </summary>
+        public bool HasUpvote
+        {
+            get
+            {
+                return hasUpvote;
+            }
+
+            internal set
+            {
+                hasUpvote = value;
+                RaisePropertyChanged(nameof(HasUpvote));
+            }
+        }
+
+
         #endregion
 
         /// <summary>
@@ -167,6 +186,8 @@ public void Upvote()
                     }
                 }
                 , TaskScheduler.FromCurrentSynchronizationContext());
+
+            HasUpvote = true;
         }
 
         [Obsolete("This API will no longer decrease package votes and will be removed in Dynamo 3.0")]
diff --git a/src/PackageDetailsViewExtension/PackageDetailsView.xaml b/src/PackageDetailsViewExtension/PackageDetailsView.xaml
@@ -24,12 +24,16 @@
             <controls:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <controls:PrettyDateConverter x:Key="PrettyDateConverter" />
             <controls:EmptyStringToHiddenConverter x:Key="EmptyStringToHiddenConverter" />
+            <SolidColorBrush x:Key="ForegroundGrayBrush" Color="#D8D8D8" />
+            <SolidColorBrush x:Key="HoverBorderGrayBrush" Color="#6d6d6d" />
+            <SolidColorBrush x:Key="PressedBorderGrayBrush" Color="#7e7e7e" />
+            <SolidColorBrush x:Key="HasVotedBlueBrush" Color="#84D7CE" />     
             <Style x:Key="LabelStyle" TargetType="TextBlock">
                 <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementBold}" />
                 <Setter Property="FontWeight" Value="Bold" />
                 <Setter Property="FontSize" Value="14px" />
                 <Setter Property="MinWidth" Value="200px" />
-                <Setter Property="Foreground" Value="#D8D8D8" />
+                <Setter Property="Foreground" Value="{StaticResource ForegroundGrayBrush}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="Margin" Value="0,0,0,5" />
                 <Setter Property="TextWrapping" Value="Wrap" />
@@ -58,6 +62,76 @@
                 <Setter Property="Padding" Value="8,0" />
                 <Setter Property="Height" Value="22px" />
             </Style>
+            <Style TargetType="{x:Type Hyperlink}">
+                <Setter Property="Foreground"
+                        Value="{StaticResource Blue300Brush}" />
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver"
+                             Value="True">
+                        <Setter Property="Foreground"
+                                Value="{StaticResource Blue400Brush}" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+
+            <Style x:Key="ImageButton" TargetType="{x:Type Button}">
+                <Setter Property="UseLayoutRounding" Value="True" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border Style="{StaticResource BorderStyle}"
+                                    x:Name="buttonBorder"
+                                    BorderBrush="{StaticResource ExtensionButtonBackgroundColor}"
+                                    BorderThickness="2">
+                                <Grid x:Name="container">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Viewbox Width="12"
+                                                 Height="12"
+                                                 VerticalAlignment="Center">    
+                                            <Path x:Name="heartIcon"
+                                                  Data="M13.91,6.75c-1.17,2.25-4.3,5.31-6.07,6.94c-0.1903,0.1718-0.4797,0.1718-0.67,0C5.39,12.06,2.26,9,1.09,6.75&#xA;&#x9;C-1.48,1.8,5-1.5,7.5,3.45C10-1.5,16.48,1.8,13.91,6.75z"
+                                                  Stroke="{StaticResource ForegroundGrayBrush}"
+                                                  StrokeThickness="1"
+                                                  VerticalAlignment="Center"/>
+                                        </Viewbox>
+                                        <TextBlock Name="VotesLabel"
+                                                   Margin="5,2,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Style="{StaticResource BodyTextStyle}"
+                                                   Text="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </StackPanel>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="heartIcon"
+                                            Property="Stroke"
+                                            Value="{StaticResource HasVotedBlueBrush}" />
+                                    <Setter TargetName="buttonBorder"
+                                            Property="BorderBrush"
+                                            Value="{StaticResource HoverBorderGrayBrush}" />
+                                </Trigger>
+                                <Trigger Property="Button.IsPressed" Value="true">
+                                    <Setter TargetName="heartIcon"
+                                            Property="Stroke"
+                                            Value="{StaticResource ForegroundGrayBrush}" />
+                                    <Setter TargetName="buttonBorder"
+                                            Property="BorderBrush"
+                                            Value="{StaticResource PressedBorderGrayBrush}" />
+                                </Trigger>
+                                <DataTrigger Binding="{Binding Path=HasVoted}" Value="True">
+                                    <Setter TargetName="heartIcon"
+                                            Property="Fill"
+                                            Value="{StaticResource HasVotedBlueBrush}" />
+                                    <Setter TargetName="heartIcon"
+                                            Property="Stroke"
+                                            Value="{StaticResource HasVotedBlueBrush}" />
+                                </DataTrigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
 
             <!--  DataGrid  -->
             <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
@@ -75,7 +149,7 @@
                                            FontFamily="{StaticResource ArtifaktElementRegular}"
                                            FontSize="14px"
                                            FontWeight="Regular"
-                                           Foreground="#D8D8D8"
+                                           Foreground="{StaticResource ForegroundGrayBrush}"
                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
                                            TextWrapping="Wrap"
                                            ToolTipService.ShowDuration="30000">
@@ -228,20 +302,9 @@
                             Orientation="Horizontal">
 
                     <!--  Votes  -->
-                    <Border Style="{StaticResource BorderStyle}">
-                        <StackPanel Orientation="Horizontal">
-                            <Rectangle Width="10" Height="10">
-                                <Rectangle.Fill>
-                                    <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Favorite.png" />
-                                </Rectangle.Fill>
-                            </Rectangle>
-                            <TextBlock Name="VotesLabel"
-                                       Margin="5,2,0,0"
-                                       VerticalAlignment="Center"
-                                       Style="{StaticResource BodyTextStyle}"
-                                       Text="{Binding NumberVotes, Converter={StaticResource NegativeIntToZeroConverter}}" />
-                        </StackPanel>
-                    </Border>
+                    <Button Style="{StaticResource ImageButton}"
+                            Content="{Binding NumberVotes, Converter={StaticResource NegativeIntToZeroConverter}}"
+                            Command="{Binding UpvoteCommand}" />
 
                     <!--  Downloads  -->
                     <Border Style="{StaticResource BorderStyle}">
@@ -333,7 +396,7 @@
                                                 <Grid Background="{StaticResource ExtensionBackgroundColor}" IsHitTestVisible="True">
                                                     <StackPanel Margin="12,8,10,5">
                                                         <TextBlock HorizontalAlignment="Left"
-                                                                   Foreground="#D8D8D8"
+                                                                   Foreground="{StaticResource ForegroundGrayBrush}"
                                                                    Text="{Binding PackageVersionNumber}" />
                                                         <Button Name="installButton"
                                                                 Command="{Binding ElementName=PackageDetailsWindow, Path=DataContext.TryInstallPackageVersionCommand}"
@@ -417,7 +480,7 @@
                                                                         </Trigger>
                                                                         <DataTrigger Binding="{Binding ElementName=PackageDetailsWindow, Path=DataContext.IsPackageDeprecated}" Value="True">
                                                                             <Setter Property="TextBlock.Opacity" Value="0.5" />
-                                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                                            <Setter Property="TextBlock.Foreground" Value="{StaticResource HasVotedBlueBrush}"  />
                                                                             <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                                         </DataTrigger>
                                                                         <DataTrigger Binding="{Binding Path=CanInstall, UpdateSourceTrigger=PropertyChanged}" Value="False">
@@ -435,7 +498,7 @@
                                                                                 <Condition Binding="{Binding ElementName=PackageDetailsWindow, Path=DataContext.IsEnabledForInstall}" Value="True" />
                                                                             </MultiDataTrigger.Conditions>
                                                                             <Setter Property="TextBlock.Opacity" Value="1" />
-                                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                                            <Setter Property="TextBlock.Foreground" Value="{StaticResource HasVotedBlueBrush}" />
                                                                         </MultiDataTrigger>
                                                                     </ControlTemplate.Triggers>
                                                                 </ControlTemplate>
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.cs b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.cs
@@ -55,6 +55,7 @@ internal void OnViewExtensionOpenWithParameterRequest(string extensionIdentifica
         
         internal void OpenPackageDetails(PackageManagerSearchElement packageManagerSearchElement)
         {
+            PackageDetailsViewModel?.Dispose();
             PackageDetailsViewModel = new PackageDetailsViewModel(this, packageManagerSearchElement);
 
             if (PackageDetailsView == null)
@@ -151,6 +152,7 @@ public override void Dispose()
 
         public override void Closed()
         {
+            PackageDetailsViewModel?.Dispose();
             PackageDetailsViewModel = null;
             PackageDetailsView = null;
             Grid = null;
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`	`<ImportGroup Label="PropertySheets">`
`3`	`3`	`<Import Project="$(SolutionDir)Config\CS_SDK.props" />`
`4`	`4`	`</ImportGroup>`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ internal void OnViewExtensionOpenWithParameterRequest(string extensionIdentifica`
`55`	`55`
`56`	`56`	`internal void OpenPackageDetails(PackageManagerSearchElement packageManagerSearchElement)`
`57`	`57`	`{`
	`58`	`+ PackageDetailsViewModel?.Dispose();`
`58`	`59`	`PackageDetailsViewModel = new PackageDetailsViewModel(this, packageManagerSearchElement);`
`59`	`60`
`60`	`61`	`if (PackageDetailsView == null)`
`@@ -151,6 +152,7 @@ public override void Dispose()`
`151`	`152`
`152`	`153`	`public override void Closed()`
`153`	`154`	`{`
	`155`	`+ PackageDetailsViewModel?.Dispose();`
`154`	`156`	`PackageDetailsViewModel = null;`
`155`	`157`	`PackageDetailsView = null;`
`156`	`158`	`Grid = null;`