DynamoDS
diff --git a/‎src/DynamoCore/Search/BrowserInternalElement.cs
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion b/‎src/DynamoCore/Search/BrowserInternalElement.cs
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Copy file name to clipboard
+9-5Lines changed: 9 additions & 5 deletions b/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Copy file name to clipboard
+9-5Lines changed: 9 additions & 5 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
Copy file name to clipboard
+90Lines changed: 90 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
Copy file name to clipboard
+90Lines changed: 90 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml.cs
Copy file name to clipboard
+33-2Lines changed: 33 additions & 2 deletions b/‎src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml.cs
Copy file name to clipboard
+33-2Lines changed: 33 additions & 2 deletions
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 
 namespace Dynamo.Search
 {
@@ -29,6 +29,11 @@ public class BrowserInternalElement : BrowserItem
         /// </summary>
         public BrowserItem OldParent { get; set; }
 
+        /// <summary>
+        ///     The framework element hosting the extension
+        /// </summary>
+        public object UIParent { get; set; }
+
         internal void ReturnToOldParent()
         {
             if (this.OldParent == null) return;
 
@@ -28,16 +28,18 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid>
+    <!-- Separate elements of this control should not be cycled through using the `Tab` key -->
+    <Grid KeyboardNavigation.IsTabStop="False">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <ItemsControl Name="Filters"
                       Grid.Column="0" Grid.Row="0"
-                      ItemsSource="{Binding Path=Filters}" 
+                      ItemsSource="{Binding Path=Filters}"
                       Background="Transparent"
+                      KeyboardNavigation.IsTabStop="False"
                       Padding="0,5,0,5">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
@@ -70,9 +72,10 @@
             </ItemsControl.ItemTemplate>
         </ItemsControl>
 
-        <ScrollViewer Grid.Row="1"  
-            VerticalScrollBarVisibility="Auto" 
-            Background="{StaticResource PreferencesWindowBackgroundColor}">
+        <ScrollViewer Grid.Row="1"
+                      VerticalScrollBarVisibility="Auto"
+                      KeyboardNavigation.IsTabStop="False"
+                      Background="{StaticResource PreferencesWindowBackgroundColor}">
             <ScrollViewer.Height>
                 <MultiBinding Converter="{StaticResource SumConverter}">
                     <Binding Path="ActualHeight"
@@ -88,6 +91,7 @@
                               ItemsSource="{Binding Path=LocalPackages}"
                               HorizontalContentAlignment="Stretch"
                               VirtualizingPanel.ScrollUnit="Pixel"
+                              KeyboardNavigation.IsTabStop="False"
                               BorderThickness="0"
                               Padding="0">
 
 
@@ -2874,6 +2874,12 @@ This package will be unloaded after the next Dynamo restart.</value>
     <value>New</value>
     <comment>Displays next to the package name in the Package Search window if the package has been added in the last 30 days.</comment>
   </data>
+  <data name="PackageManagerSearchPackagesControlName" xml:space="preserve">
+    <value>packageManagerSearchPackages</value>
+  </data>
+  <data name="PackageManagerMyPackagesControlName" xml:space="preserve">
+    <value>packageManagerMyPackages</value>
+  </data>
   <data name="PackageDetailsDescription" xml:space="preserve">
     <value>DESCRIPTION</value>
     <comment>Header in the PackageDetailsViewExtension.</comment>
@@ -3651,4 +3657,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="PreferencesViewIncludeTimestampExportPathTooltip" xml:space="preserve">
     <value>When toggled on, file names of exported images include date and time of export.</value>
   </data>
-</root>
+</root>
@@ -1259,6 +1259,12 @@ Don't worry, you'll have the option to save your work.</value>
     <value>New</value>
     <comment>Displays next to the package name in the Package Search window if the package has been added in the last 30 days.</comment>
   </data>
+  <data name="PackageManagerSearchPackagesControlName" xml:space="preserve">
+    <value>packageManagerSearchPackages</value>
+  </data>
+  <data name="PackageManagerMyPackagesControlName" xml:space="preserve">
+    <value>packageManagerMyPackages</value>
+  </data>
   <data name="PackageDetailsDescription" xml:space="preserve">
     <value>DESCRIPTION</value>
     <comment>Header in the PackageDetailsViewExtension.</comment>
@@ -3638,4 +3644,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="PreferencesViewIncludeTimestampExportPathTooltip" xml:space="preserve">
     <value>When toggled on, file names of exported images include date and time of export.</value>
   </data>
-</root>
+</root>
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Timers;
 using System.Windows;
 using System.Windows.Input;
 using Dynamo.Configuration;
@@ -371,6 +372,25 @@ public PackageSearchState SearchState
                 RaisePropertyChanged(nameof(this.SearchState));
                 RaisePropertyChanged(nameof(this.SearchBoxPrompt));
                 RaisePropertyChanged(nameof(this.ShowSearchText));
+
+                if (value == PackageSearchState.Results && !this.InitialResultsLoaded)
+                {
+                    this.InitialResultsLoaded = true;
+                }
+            }
+        }
+
+        private bool _initialResultsLoaded = false;
+        /// <summary>
+        /// Will only be set to true once after the initial search has been finished.
+        /// </summary>
+        public bool InitialResultsLoaded
+        {
+            get { return _initialResultsLoaded; }
+            set
+            {
+                _initialResultsLoaded = value;
+                RaisePropertyChanged(nameof(InitialResultsLoaded));
             }
         }
 
@@ -445,6 +465,19 @@ public IPreferences Preferences
             get { return PackageManagerClientViewModel.DynamoViewModel.PreferenceSettings; }
         }
 
+        private bool isDetailPackagesExtensionOpened;
+        public bool IsDetailPackagesExtensionOpened
+        {
+            get { return isDetailPackagesExtensionOpened; }
+            set
+            {
+                if (isDetailPackagesExtensionOpened != value)
+                {
+                    isDetailPackagesExtensionOpened = value;
+                    RaisePropertyChanged(nameof(IsDetailPackagesExtensionOpened));
+                }
+            }
+        }
         #endregion Properties & Fields
 
         internal PackageManagerSearchViewModel()
@@ -816,6 +849,8 @@ public IEnumerable<PackageManagerSearchElementViewModel> RefreshAndSearch()
 
         public void RefreshAndSearchAsync()
         {
+            StartTimer();   // Times out according to MAX_LOAD_TIME
+
             this.ClearSearchResults();
             this.SearchState = PackageSearchState.Syncing;
 
@@ -835,6 +870,7 @@ public void RefreshAndSearchAsync()
                         this.AddToSearchResults(result);
                     }
                     this.SearchState = HasNoResults ? PackageSearchState.NoResults : PackageSearchState.Results;
+                    TimedOut = false;
 
                     if (!DynamoModel.IsTestMode)
                     {
@@ -852,6 +888,50 @@ public void RefreshAndSearchAsync()
             , TaskScheduler.FromCurrentSynchronizationContext()); // run continuation in ui thread
         }
 
+        #region Time Out
+
+        // maximum loading time for packages - 30 seconds
+        // if exceeded will trigger `timed out` event and failure screen
+        internal int MAX_LOAD_TIME = 30 * 1000;
+        private bool _timedOut;
+        /// <summary>
+        /// Will trigger timed out event
+        /// </summary>
+        public bool TimedOut
+        {
+            get { return _timedOut; }
+            set
+            {
+                _timedOut = value;
+                RaisePropertyChanged(nameof(TimedOut));
+            }
+        }
+
+        private void StartTimer()
+        {
+            var aTimer = new System.Timers.Timer();
+            aTimer.Elapsed += new ElapsedEventHandler(OnTimedEvent);
+            aTimer.Interval = MAX_LOAD_TIME;
+            aTimer.AutoReset = false;
+            aTimer.Enabled = true;
+        }
+
+        private void OnTimedEvent(object sender, ElapsedEventArgs e)
+        {
+            var aTimer = (System.Timers.Timer)sender;
+            aTimer.Dispose();
+
+            // If we have managed to get all the results
+            // Simply dispose of the timer
+            // Otherwise act 
+            if (this.SearchState != PackageSearchState.Results)
+            {
+                TimedOut = true;
+            }
+        }
+
+        #endregion
+
         internal void RefreshInfectedPackages()
         {
             //do not call a protected route, if user is not logged in already.
@@ -1327,5 +1407,15 @@ public void DisableSearchTextBox()
                 RequestDisableTextSearch(null, null);
             }
         }
+
+        /// <summary>
+        /// Clear after closing down
+        /// </summary>
+        internal void Close()
+        {
+            TimedOut = false;   // reset the timedout screen 
+            InitialResultsLoaded = false;   // reset the loading screen settings
+            RequestShowFileDialog -= OnRequestShowFileDialog;
+        }
     }
 }
@@ -1,8 +1,9 @@
-using Dynamo.PackageManager.ViewModels;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using Dynamo.PackageManager.ViewModels;
+using Dynamo.Utilities;
 
 namespace Dynamo.PackageManager.UI
 {
@@ -14,6 +15,9 @@ public partial class PackageManagerPackagesControl : UserControl
 
         #region Properties
 
+        private static readonly string packageManagerSearchPackagesName = "packageManagerSearchPackages";
+        private static readonly string packageManagerMyPackagesName = "packageManagerMyPackages";
+
         /// <summary>
         ///     Allows different collections of SearchItems to be assigned per instance of the PackageManagerPackagesControl
         /// </summary>
@@ -77,7 +81,6 @@ public PackageManagerPackagesControl()
             InitializeComponent();
         }
 
-
         /// <summary>
         ///     Executes a command that opens the package details view extension.
         /// </summary>
@@ -89,6 +92,34 @@ private void ViewDetailsButton_OnClick(object sender, RoutedEventArgs e)
             if (!(button.DataContext is PackageManagerSearchElementViewModel packageManagerSearchElementViewModel)) return;
 
             var PkgSearchVM = this.DataContext as PackageManagerSearchViewModel;
+
+            var name = this.Name;
+            if (name.Equals(packageManagerSearchPackagesName))
+            {
+                var parent = WpfUtilities.FindUpVisualTree<PackageManagerSearchControl>(this) as PackageManagerSearchControl;
+                if (parent == null) return;
+
+                packageManagerSearchElementViewModel.Model.UIParent = parent.packageDetailsGrid;
+                if (parent.packageDetailsGrid.Width.Value <= 1.0)
+                {
+                    var width = (parent.packageDetailsGrid.Parent as Grid).ActualWidth * 0.5;
+                    parent.packageDetailsGrid.Width = new GridLength(width, GridUnitType.Pixel);
+                }
+            }
+            else if (name.Equals(packageManagerMyPackagesName))
+            {
+                var parent = WpfUtilities.FindUpVisualTree<PackageManagerView>(this) as PackageManagerView;
+                if (parent == null) return;
+
+                packageManagerSearchElementViewModel.Model.UIParent = parent.packageDetailsGrid;
+                if (parent.packageDetailsGrid.Width.Value <= 1.0)
+                {
+                    var width = (parent.packageDetailsGrid.Parent as Grid).ActualWidth * 0.5;
+                    parent.packageDetailsGrid.Width = new GridLength(width, GridUnitType.Pixel);
+                }
+            }
+
+            PkgSearchVM.IsDetailPackagesExtensionOpened = true;
             PkgSearchVM?.ViewPackageDetailsCommand.Execute(packageManagerSearchElementViewModel.Model);
         }
     }