From 697117b7b91596215242fa6f1fb105a179804ac4 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Tue, 14 Nov 2023 22:20:46 +0000 Subject: [PATCH] DYN-6411 update version check (#14583) * update version check - removed the ability to update package version if not the creator of the package - ui updates as per latest Figma design * comments - renamed DynamoViewModelRequestRequestPackageManagerPublish - renamed CanDeprecate to IsOwner * refactor anonymous _searchPkgsView.Closed event handling - now_searchPkgsView.Closed subscribes and unsubscribes explicitly - if _searchPkgsView has been created, we will unsubscribe inside the DynamoView WindowClosed event * refactor update - updated the correct PackageManagerView to be targeted by the changes * Update DynamoView.xaml.cs * test fixes - the 2 failing tests were referring to the outdated PublishPackageView - now replaced with the PackageManagerView which contains the publish package ui --- .../Controls/InstalledPackagesControl.xaml | 54 +++++++++++-------- .../UI/Themes/Modern/DynamoModern.xaml | 6 ++- .../PackageManagerSearchViewModel.cs | 2 +- .../PackageManager/PackageViewModel.cs | 10 ++-- .../Views/Core/DynamoView.xaml.cs | 45 +++++++++++----- .../PackageManagerPublishControl.xaml.cs | 12 +++-- .../PackageManager/PackageManagerView.xaml.cs | 7 ++- .../PackageManager/PackageManagerUITests.cs | 6 +-- 8 files changed, 89 insertions(+), 53 deletions(-) diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml index 1560f8cd272..6bf51a5ad9e 100644 --- a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml +++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml @@ -39,6 +39,7 @@ ItemsSource="{Binding Path=Filters}" Background="Transparent" KeyboardNavigation.IsTabStop="False" + VerticalContentAlignment="Center" Padding="0,5,0,5"> @@ -53,17 +54,21 @@ Style="{StaticResource {x:Type ToggleButton}}" FontSize="10" FontFamily="Artifakt Element" + FontWeight="Medium" HorizontalAlignment="Center" - BorderThickness="1,1,1,1" - Background="{StaticResource PrimaryCharcoal300Brush}" + BorderThickness="1" + BorderBrush="Transparent" + UseLayoutRounding="True" + SnapsToDevicePixels="True" + Background="#CCCCCC" Checked="ToggleButton_OnChecked" - Foreground="{StaticResource ExpanderCaretToggleButtonBackground}"> + Foreground="{StaticResource PackageManagerTabBackgroundColor}"> @@ -92,21 +97,20 @@ ItemsPresenter can't be wider then visible part of the window.--> + IsExpanded="{Binding Path=Model.TypesVisibleInManager}" + Style="{StaticResource InstalledPackagesExpanderStyle}"> - + + + + - + MaxWidth="150" + Margin="10 0"> + @@ -133,14 +142,13 @@ TextTrimming="CharacterEllipsis" FontSize="10" FontFamily="Artifakt Element" + FontWeight="Medium" TextAlignment="Left" HorizontalAlignment="Center" - Margin="0,3,0,0" - Foreground="{StaticResource PrimaryCharcoal100Brush}"/> + Margin="0,2,0,0" + Foreground="{StaticResource PackageManagerTabBackgroundColor}"/> - -