DynamoDS
diff --git a/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions b/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+21-1Lines changed: 21 additions & 1 deletion b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+21-1Lines changed: 21 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+53-2Lines changed: 53 additions & 2 deletions b/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+53-2Lines changed: 53 additions & 2 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Images/PackageManager/empty-state-first-use-light-gray.png
Copy file name to clipboard
8.35 KB b/‎src/DynamoCoreWpf/UI/Images/PackageManager/empty-state-first-use-light-gray.png
Copy file name to clipboard
8.35 KB
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
Copy file name to clipboard
+48Lines changed: 48 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
Copy file name to clipboard
+48Lines changed: 48 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
Copy file name to clipboard
+9-1Lines changed: 9 additions & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
Copy file name to clipboard
+9-1Lines changed: 9 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml
Copy file name to clipboard
+83Lines changed: 83 additions & 0 deletions b/‎src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml
Copy file name to clipboard
+83Lines changed: 83 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml.cs
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml.cs
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
@@ -1,4 +1,4 @@
-<UserControl x:Class="Dynamo.Wpf.Controls.InstalledPackagesControl"
+<UserControl x:Class="Dynamo.Wpf.Controls.InstalledPackagesControl"
              xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -17,7 +17,7 @@
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
             </ResourceDictionary.MergedDictionaries>
-            <controls:SumConverter x:Key="SumConverter"/>
+            <controls:SumConverter x:Key="SumConverter" />
             <Style TargetType="{x:Type MenuItem}" x:Key="MenuItemCollapseStyle">
                 <Style.Triggers>
                     <Trigger Property="IsEnabled" Value="False">
@@ -33,6 +33,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        
         <ItemsControl Name="Filters"
                       Grid.Column="0" Grid.Row="0"
                       ItemsSource="{Binding Path=Filters}" 
@@ -68,6 +69,7 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
+        
         <ScrollViewer Grid.Row="1"  
             VerticalScrollBarVisibility="Auto" 
             Background="{StaticResource PreferencesWindowBackgroundColor}">
@@ -361,6 +363,7 @@
 
             </ItemsControl>
         </ScrollViewer>
+
     </Grid>
 
 </UserControl>
@@ -57,12 +57,16 @@
     <None Remove="Packages\SplashScreen\build\index.html" />
     <None Remove="UI\Images\Canvas\canvas-button-geometry-scaling.png" />
     <None Remove="UI\Images\NodeStates\package-64px.png" />
+    <None Remove="UI\Images\PackageManager\empty-state-first-use-light-gray.png" />
     <None Remove="UI\Prompts\PortPropertiesEditPrompt.xaml" />
     <None Remove="Views\Core\CustomColorPicker.xaml" />
     <None Remove="Views\Core\GeometryScalingPopup.xaml" />
     <None Remove="UI\Images\question-hover-blue-16px.png" />
-    <None Remove="Views\PackageManager\Controls\ControlColorsAndBrushes.xaml" />
+    <None Remove="Views\PackageManager\Controls\ControlColorsAndBrushes.xaml" />      
+    <None Remove="Views\PackageManager\Controls\LoadingAnimationStripeControl.xaml" />
+    <None Remove="Views\PackageManager\Controls\PackageManagePackageAnimationControl.xaml" />
     <None Remove="Views\PackageManager\Controls\PackageManagerPublishControl.xaml" />
+    <None Remove="Views\PackageManager\Controls\PackageManagerPackagesControl.xaml" />
     <None Remove="Views\PackageManager\Controls\PackageManagerSearchControl.xaml" />
     <None Remove="Views\PackageManager\Controls\SearchBoxControl.xaml" />
     <None Remove="Views\SplashScreen\WebApp\splashScreenBackground.png" />
@@ -424,6 +428,9 @@
       <DependentUpon>SurveyPopupWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Input\ParameterEditor.cs" />
+    <Compile Include="Views\PackageManager\Controls\LoadingAnimationStripeControl.xaml.cs" />
+    <Compile Include="Views\PackageManager\Controls\PackageManagePackageAnimationControl.xaml.cs" />
+    <Compile Include="Views\PackageManager\Controls\PackageManagerPackagesControl.xaml.cs" />
     <Compile Include="Views\PackageManager\Controls\PackageManagerPublishControl.xaml.cs" />
     <Compile Include="Views\PackageManager\Controls\PackageManagerSearchControl.xaml.cs" />
     <Compile Include="Views\PackageManager\Controls\SearchBoxControl.xaml.cs" />
@@ -615,6 +622,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\PackageManager\Controls\LoadingAnimationStripeControl.xaml">
+        <SubType>Designer</SubType>
+        <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\PackageManager\Controls\PackageManagePackageAnimationControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\PackageManager\Controls\SearchBoxControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -631,6 +646,10 @@
         <Generator>MSBuild:Compile</Generator>
         <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\PackageManager\Controls\PackageManagerPackagesControl.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\PackageManager\Controls\PackageManagerSearchControl.xaml">
         <Generator>MSBuild:Compile</Generator>
         <SubType>Designer</SubType>
@@ -900,6 +919,7 @@
     <Resource Include="UI\Images\NodeStates\hidden-64px.png" />
     <Resource Include="UI\Images\NodeStates\info-64px.png" />
     <Resource Include="UI\Images\NodeStates\package-64px.png" />
+    <Resource Include="UI\Images\PackageManager\empty-state-first-use-light-gray.png" />
     <Resource Include="UI\Images\question-hover-blue-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-darktheme-default-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-lighttheme-default-16px.png" />
 
@@ -10,7 +10,6 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
 using Dynamo.Configuration;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Workspaces;
@@ -152,6 +151,26 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+
+    /// <summary>
+    /// Returns Visibility.Visible if the collection is empty, otherwise returns Visibility.Collapsed.
+    /// </summary>
+    public class EmptyListToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(value is ICollection collection)) return Visibility.Collapsed;
+
+            return collection.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+
+
     /// <summary>
     /// Controls the visibility of tooltip that displays python dependency in Package manager for each package version
     /// </summary>
@@ -3748,7 +3767,6 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
         }
     }
 
-
     public class SumConverter : IMultiValueConverter
     {
         /// <summary>
@@ -3764,4 +3782,37 @@ public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
             return null;
         }
     }
+
+    public class PackageSearchStateToVisibilityConverter : IValueConverter
+    {
+        /// <summary>
+        /// Returns Visibility.Visible or Visibility.Collapsed based on the value of the Enum and the provided parameter
+        /// </summary>
+        /// <returns>Visibility.Visible or Visibility.Collapsed</returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var searchState = (PackageManagerSearchViewModel.PackageSearchState) value;
+
+            // If no parameter is specified, we use True value
+            bool param = parameter == null || bool.Parse(parameter.ToString());
+
+            // If we have finished searching, and no parameter, or true parameter is provided, return Visible 
+            if (PackageManagerSearchViewModel.PackageSearchState.Results == searchState && param)
+            {
+                return Visibility.Visible;
+            }
+            // If we are still searching, and false parameter is provided, then also return Visible (loading screen)
+            else if(PackageManagerSearchViewModel.PackageSearchState.Results != searchState && !param)
+            {
+                return Visibility.Visible;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }
@@ -149,6 +149,8 @@ private void SetFilterHosts(object obj)
         // Lucene search utility to perform indexing operations.
         internal LuceneSearchUtility LuceneSearchUtility { get; set; }
 
+        private ObservableCollection<PackageManagerSearchElementViewModel> searchMyResults;
+
         // The results of the last synchronization with the package manager server
         public List<PackageManagerSearchElement> LastSync { get; set; }
 
@@ -288,6 +290,22 @@ public int SelectedIndex
         /// </value>
         public ObservableCollection<PackageManagerSearchElementViewModel> SearchResults { get; internal set; }
 
+        /// <summary>
+        /// Returns a new filtered collection of packages based on the current user
+        /// </summary>
+        public ObservableCollection<PackageManagerSearchElementViewModel> SearchMyResults
+        {
+            set
+            {                
+                searchMyResults = value;
+                RaisePropertyChanged(nameof(SearchMyResults));                
+            }
+            get
+            {
+                return searchMyResults;
+            }
+        }
+
         /// <summary>
         ///     MaxNumSearchResults property
         /// </summary>
@@ -494,6 +512,33 @@ internal void InitializeLuceneForPackageManager()
             }          
             LuceneSearchUtility.InitializeLuceneConfig(LuceneConfig.PackagesIndexingDirectory);
         }
+        
+        /// <summary>
+        /// Populates SearchMyResults collection containing all packages by current user
+        /// </summary>
+        private void PopulateMyPackages()
+        {
+            // First, clear already existing results to prevent stacking 
+            if (SearchMyResults != null) return;
+            // We should have already populated the CachedPackageList by this step
+            if (PackageManagerClientViewModel.CachedPackageList == null ||
+                !PackageManagerClientViewModel.CachedPackageList.Any()) return;
+            // We need the user to be logged in, otherwise there is no point in runnig this routine
+            if (PackageManagerClientViewModel.LoginState != Greg.AuthProviders.LoginState.LoggedIn) return;
+
+            List<PackageManagerSearchElement> packageManagerSearchElements;
+            List<PackageManagerSearchElementViewModel> myPackages = new List<PackageManagerSearchElementViewModel>();
+
+            // Check if any of the maintainers corresponds to the current logged in username
+            var name = PackageManagerClientViewModel.Username;
+            var pkgs = PackageManagerClientViewModel.CachedPackageList.Where(x => x.Maintainers != null && x.Maintainers.Contains(name)).ToList();
+            foreach(var pkg in pkgs)
+            {
+                myPackages.Add(new PackageManagerSearchElementViewModel(pkg, false));
+            }
+    
+            SearchMyResults = new ObservableCollection<PackageManagerSearchElementViewModel>(myPackages);
+        }
 
         /// <summary>
         /// Sort the default package results in the view based on the sorting key and sorting direction.
@@ -754,6 +799,8 @@ public void Refresh()
                 SearchDictionary.Add(pkg, pkg.Maintainers);
                 SearchDictionary.Add(pkg, pkg.Keywords);
             }
+
+            PopulateMyPackages();   // adding 
         }
 
         /// <summary>
@@ -763,6 +810,7 @@ public void Refresh()
         public IEnumerable<PackageManagerSearchElementViewModel> RefreshAndSearch()
         {
             Refresh();
+            PopulateMyPackages();  
             return GetAllPackages();
         }
 
 
@@ -1,3 +1,4 @@
+using Dynamo.Controls;
 using Dynamo.ViewModels;
 #if NETFRAMEWORK
 using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
@@ -40,7 +41,7 @@ public class PackageManagerViewModel : NotificationObject
 
         public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSearchViewModel PkgSearchVM)
         {
-            this.dynamoViewModel = dynamoViewModel;            
+            this.dynamoViewModel = dynamoViewModel;
             this.PackageSearchViewModel = PkgSearchVM;            
 
             this.PreferencesViewModel = dynamoViewModel.PreferencesViewModel;
@@ -54,6 +55,13 @@ public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSe
             InitializeInstalledPackages();
 
             PkgSearchVM.RegisterTransientHandlers();
+
+            LocalPackages.CollectionChanged += LocalPackages_CollectionChanged;
+        }
+
+        private void LocalPackages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            RaisePropertyChanged(nameof(LocalPackages));
         }
 
         private void InitializeInstalledPackages()
 
@@ -0,0 +1,83 @@
+<UserControl x:Class="Dynamo.PackageManager.UI.LoadingAnimationStripeControl"
+             xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="https://schemas.microsoft.com/expression/blend/2008"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:local="clr-namespace:Dynamo.PackageManager.UI"
+             mc:Ignorable="d"
+             d:DesignHeight="200"
+             d:DesignWidth="500"
+             Background="Transparent">
+    <UserControl.Resources>
+        <sys:Double x:Key="animationSpeed">1.5</sys:Double>
+    </UserControl.Resources>
+    <Grid HorizontalAlignment="Stretch"
+          VerticalAlignment="Stretch">
+        <!--Base color-->
+        <Rectangle HorizontalAlignment="Stretch"
+                   Name="viewDetailsRectangleBackground"
+                   Fill="#33808080">
+        </Rectangle>
+        <!--Moving part-->
+        <Rectangle HorizontalAlignment="Stretch"
+                   Name="viewDetailsRectangle">
+            <Rectangle.Fill>
+                <LinearGradientBrush StartPoint="1,0.5"
+                                     EndPoint="0,0.5">
+                    <GradientStop Color="#33808080"
+                                  Offset="0" />
+                    <GradientStop x:Name="GradiantStopA"
+                                  Color="#808080"
+                                  Offset="0.5" />
+                    <GradientStop Color="#33808080"
+                                  Offset="1" />
+                </LinearGradientBrush>
+            </Rectangle.Fill>
+            <Rectangle.Triggers>
+                <EventTrigger RoutedEvent="Loaded">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <!--Gradient offset animation-->
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="GradiantStopA"
+                                                           Storyboard.TargetProperty="Offset"
+                                                           RepeatBehavior="Forever"
+                                                           AccelerationRatio="0.5"
+                                                           DecelerationRatio="0.5"
+                                                           SpeedRatio="{DynamicResource animationSpeed}">
+                                <LinearDoubleKeyFrame Value="0.9"
+                                                      KeyTime="0:0:0">
+                                </LinearDoubleKeyFrame>
+                                <LinearDoubleKeyFrame Value="0.5"
+                                                      KeyTime="0:0:1.5">
+                                </LinearDoubleKeyFrame>
+                                <LinearDoubleKeyFrame Value="0.1"
+                                                      KeyTime="0:0:3">
+                                </LinearDoubleKeyFrame>
+                            </DoubleAnimationUsingKeyFrames>
+                            <!--Opacity animation-->
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity"
+                                                           RepeatBehavior="Forever"
+                                                           AccelerationRatio="0.5"
+                                                           DecelerationRatio="0.5"
+                                                           SpeedRatio="{DynamicResource animationSpeed}">
+                                <LinearDoubleKeyFrame Value="0"
+                                                      KeyTime="0:0:0">
+                                </LinearDoubleKeyFrame>
+                                <LinearDoubleKeyFrame Value="1"
+                                                      KeyTime="0:0:1.5">
+                                </LinearDoubleKeyFrame>
+                                <LinearDoubleKeyFrame Value="0"
+                                                      KeyTime="0:0:3">
+                                </LinearDoubleKeyFrame>
+                                <LinearDoubleKeyFrame Value="0"
+                                                      KeyTime="0:0:6">
+                                </LinearDoubleKeyFrame>
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+            </Rectangle.Triggers>
+        </Rectangle>
+    </Grid>
+</UserControl>
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace Dynamo.PackageManager.UI
+{
+    /// <summary>
+    /// Interaction logic for LoadingAnimationStripeControl.xaml
+    /// </summary>
+    public partial class LoadingAnimationStripeControl : UserControl
+    {
+        public LoadingAnimationStripeControl()
+        {
+            InitializeComponent();
+        }
+    }
+}