DYN-7343: Pm search compatibility filters update (#15603)

dnenov · web-flow · commit 3ace9378d2b6 · 2024-11-05T15:21:31.000-05:00
diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt
@@ -696,6 +696,10 @@ Dynamo.Controls.TreeViewVLineMarginConverter
 Dynamo.Controls.TreeViewVLineMarginConverter.Convert(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
 Dynamo.Controls.TreeViewVLineMarginConverter.ConvertBack(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
 Dynamo.Controls.TreeViewVLineMarginConverter.TreeViewVLineMarginConverter() -> void
+Dynamo.Controls.VersionStringAsteriskToXConverter
+Dynamo.Controls.VersionStringAsteriskToXConverter.Convert(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
+Dynamo.Controls.VersionStringAsteriskToXConverter.ConvertBack(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
+Dynamo.Controls.VersionStringAsteriskToXConverter.VersionStringAsteriskToXConverter() -> void
 Dynamo.Controls.ViewButtonClipRectConverter
 Dynamo.Controls.ViewButtonClipRectConverter.Convert(object[] values, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
 Dynamo.Controls.ViewButtonClipRectConverter.ConvertBack(object value, System.Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture) -> object[]
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
@@ -4029,4 +4029,29 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    /// <summary>
+    /// Returns "2019.10.x" from "2019.10.*" input
+    /// </summary>
+    public class VersionStringAsteriskToXConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string version && !string.IsNullOrEmpty(version))
+            {
+                return version.Replace("*", "x");
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string version && !string.IsNullOrEmpty(version))
+            {
+                return version.Replace("x", "*");
+            }
+
+            return value;
+        }
+    }
 }
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
@@ -203,15 +203,19 @@
     <Color x:Key="PMBorderColor">#5F5F5F</Color>
     <Color x:Key="PMHeaderBackgroundColor">#3f3f3f</Color>
     <Color x:Key="PMDataGridBackgroundColor">#474747</Color>
+    <Color x:Key="PMDataAltBackgroundColor">#535353</Color>
     <Color x:Key="PMVersionCompatibleColor">#87B340</Color>
     <Color x:Key="PMVersionUncompatibleColor">#EB5555</Color>
     <Color x:Key="PMVersionUnknownColor">#73C5FF</Color>
+    <Color x:Key="PMInnerVerticleLineColor">#646464</Color>
 
     <SolidColorBrush x:Key="PMForegroundColorBrush" Color="{StaticResource PMForegroundColor}" />
     <SolidColorBrush x:Key="PMBorderColorBrush" Color="{StaticResource PMBorderColor}" />
     <SolidColorBrush x:Key="PMHeaderBackgroundColorBrush" Color="{StaticResource PMHeaderBackgroundColor}" />
     <SolidColorBrush x:Key="PMDataGridBackgroundColorBrush" Color="{StaticResource PMDataGridBackgroundColor}" />
+    <SolidColorBrush x:Key="PMDataAltBackgroundColorBrush" Color="{StaticResource PMDataAltBackgroundColor}" />
     <SolidColorBrush x:Key="PMVersionCompatibleColorBrush" Color="{StaticResource PMVersionCompatibleColor}" />
     <SolidColorBrush x:Key="PMVersionUncompatibleColorBrush" Color="{StaticResource PMVersionUncompatibleColor}" />
     <SolidColorBrush x:Key="PMVersionUnknownColorBrush" Color="{StaticResource PMVersionUnknownColor}" />
+    <SolidColorBrush x:Key="PMInnerVerticleLineColorBrush" Color="{StaticResource PMInnerVerticleLineColor}" />
 </ResourceDictionary>
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -6480,7 +6480,7 @@
         <Setter Property="BorderBrush" Value="{StaticResource DarkMidGreyBrush}" />
         <Setter Property="ColumnWidth" Value="Auto" />
         <Setter Property="GridLinesVisibility" Value="Vertical" />
-        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource DarkMidGreyBrush}" />
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource PMInnerVerticleLineColorBrush}" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -825,6 +825,24 @@ internal void filter_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     negateFilter.OnChecked = false;
                     break;
 
+                // Mutually exclusive case for Compatible and Incompatible
+                case var name when name.Equals(Resources.PackageCompatible):
+                    if (!filter.OnChecked)
+                        break;
+                    var incompatibleFilter = CompatibilityFilter.First(x => x.FilterName.Equals(Resources.PackageIncompatible));
+                    if (!incompatibleFilter.OnChecked)
+                        break;
+                    incompatibleFilter.OnChecked = false;
+                    break;
+
+                case var name when name.Equals(Resources.PackageIncompatible):
+                    if (!filter.OnChecked)
+                        break;
+                    var compatibleFilter = CompatibilityFilter.First(x => x.FilterName.Equals(Resources.PackageCompatible));
+                    if (!compatibleFilter.OnChecked)
+                        break;
+                    compatibleFilter.OnChecked = false;
+                    break;
             }
         }
 
diff --git a/src/PackageDetailsViewExtension/PackageDetailsView.xaml b/src/PackageDetailsViewExtension/PackageDetailsView.xaml
@@ -29,6 +29,7 @@
             <controls:InverseEmptyListToVisibilityConverter x:Key="InverseEmptyListToVisibilityConverter" />
             <controls:CopyrightInfoTooltipConverter x:Key="CopyrightInfoTooltipConverter" />
             <controls:PackageDetailsLinkCollapseOnEmpty x:Key="PackageDetailsLinkCollapseOnEmpty" />
+            <controls:VersionStringAsteriskToXConverter x:Key="VersionStringAsteriskToXConverter" />
             <SolidColorBrush x:Key="ForegroundGrayBrush" Color="#D8D8D8" />
             <SolidColorBrush x:Key="HoverBorderGrayBrush" Color="#6d6d6d" />
             <SolidColorBrush x:Key="PressedBorderGrayBrush" Color="#7e7e7e" />
@@ -693,7 +694,7 @@
                                             <TextBlock Margin="0,5" Text="{x:Static p:Resources.PackageDetailsCompatibilityWithSetup}" />
                                             <DataGrid x:Name="VersionCompatibilityDataGrid"
                                                       Margin="0,0,20,20"
-                                                      AlternatingRowBackground="{StaticResource PMDataGridBackgroundColorBrush}"
+                                                      AlternatingRowBackground="{StaticResource PMDataAltBackgroundColorBrush}"
                                                       AlternationCount="2"
                                                       AutoGenerateColumns="False"
                                                       Background="{StaticResource ExtensionBackgroundColor}"
@@ -709,6 +710,7 @@
                                                       IsReadOnly="True"
                                                       IsSynchronizedWithCurrentItem="True"
                                                       ItemsSource="{Binding VersionInformation}"
+                                                      RowBackground="{StaticResource PMDataGridBackgroundColorBrush}"
                                                       RowDetailsVisibilityMode="Collapsed"
                                                       ScrollViewer.CanContentScroll="True"
                                                       ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -721,7 +723,7 @@
                                                                         Binding="{Binding CompatibilityName}"
                                                                         Header="" />
                                                     <DataGridTextColumn Width="3*"
-                                                                        Binding="{Binding Versions}"
+                                                                        Binding="{Binding Versions, Converter={StaticResource VersionStringAsteriskToXConverter}}"
                                                                         Header="{x:Static p:Resources.PublishPackageViewPackageVersion}" />
                                                 </DataGrid.Columns>
                                             </DataGrid>
diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerSearchElementViewModelTests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerSearchElementViewModelTests.cs
@@ -593,6 +593,8 @@ public void PackageSearchDialogSearchTestCompatibilityFilters()
                 new FilterEntry(unknownCompatibilityFilterName, "Filter by compatibility", "Unknown Compatibility Packages", packageManagerSearchViewModel) { OnChecked = false },
             };
 
+            packageManagerSearchViewModel.CompatibilityFilter.ForEach(f => f.PropertyChanged += packageManagerSearchViewModel.filter_PropertyChanged);
+
             // Adding compatible packages
             foreach (var package in compatiblePackagesName)
             {
@@ -654,17 +656,19 @@ public void PackageSearchDialogSearchTestCompatibilityFilters()
             Assert.IsNotNull(packageManagerSearchViewModel.SearchResults, "No results found");
             Assert.That(packageManagerSearchViewModel.SearchResults.Count == compatiblePackagesName.Count, "Filtered results do not match the compatible packages");
 
-            // Reset (Filters are not mutually exclusive)
-            packageManagerSearchViewModel.CompatibilityFilter[0].OnChecked = false;
-
             // Check the Incompatible filter
             packageManagerSearchViewModel.CompatibilityFilter[1].OnChecked = true;
             packageManagerSearchViewModel.CompatibilityFilter[1].FilterCommand.Execute(string.Empty);
             Assert.IsNotNull(packageManagerSearchViewModel.SearchResults, "No results found");
             Assert.That(packageManagerSearchViewModel.SearchResults.Count == incompatiblePackagesName.Count, "Filtered results do not match the incompatible packages");
 
-            // Reset (Filters are not mutually exclusive)
-            packageManagerSearchViewModel.CompatibilityFilter[1].OnChecked = false;
+            // Asserts that Compatible and Incompatible filters are mutually exclusive
+            Assert.IsFalse(packageManagerSearchViewModel.CompatibilityFilter[0].OnChecked, "Compatible and Incompatible filters should be mutually exclusive");
+            packageManagerSearchViewModel.CompatibilityFilter[0].OnChecked = true;
+            Assert.IsFalse(packageManagerSearchViewModel.CompatibilityFilter[1].OnChecked, "Compatible and Incompatible filters should be mutually exclusive");
+
+            // Reset (These filters are not mutually exclusive)
+            packageManagerSearchViewModel.CompatibilityFilter[0].OnChecked = false;
 
             // Check the Unknown Compatibility filter
             packageManagerSearchViewModel.CompatibilityFilter[2].OnChecked = true;
