From 1b955213b1effc1892aec3b061836b3c5659e098 Mon Sep 17 00:00:00 2001
From: "GLOBAL\\ryan.porter" <ryan.porter@arup.com>
Date: Mon, 18 Mar 2019 09:43:56 +0000
Subject: [PATCH 1/8] Added "Please wait..." string to resource files.

Added styles to control package search information text.
---
 .../Properties/Resources.Designer.cs          |  9 ++++++++
 .../Properties/Resources.en-US.resx           |  3 +++
 src/DynamoCoreWpf/Properties/Resources.resx   |  3 +++
 .../PackageManagerSearchView.xaml             | 21 +++++++++++++++++++
 4 files changed, 36 insertions(+)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 59d25454257..2551d4283d4 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -4002,6 +4002,15 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Please wait....
+        /// </summary>
+        public static string PackageSearchViewPleaseWait {
+            get {
+                return ResourceManager.GetString("PackageSearchViewPleaseWait", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Search....
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 9411ad49d8b..184f77f57f8 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2184,4 +2184,7 @@ Do you want to install the latest Dynamo update?</value>
   <data name="RerunButtonToolTip" xml:space="preserve">
     <value>Rerun the graph.</value>
   </data>
+  <data name="PackageSearchViewPleaseWait" xml:space="preserve">
+    <value>Please wait...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 54250d19fc4..88b5461d29d 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2187,4 +2187,7 @@ Want to publish a different package?</value>
   <data name="CrashPromptGithubNewIssueTitle" xml:space="preserve">
     <value>Crash report from Dynamo {0}</value>
   </data>
+  <data name="PackageSearchViewPleaseWait" xml:space="preserve">
+    <value>Please wait...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
index 9d074ad022b..2b69f28b271 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -12,6 +12,27 @@
 
     <Window.Resources>
         <ResourceDictionary>
+
+            <Style x:Key="PackageSearchTextBox" TargetType="TextBox">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding SearchState}" Value="Syncing">
+                        <Setter Property="Visibility" Value="Collapsed"/>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+
+            <Style x:Key="PackageSearchTextBlock" TargetType="TextBlock">
+                <Setter Property="Text" Value="{x:Static p:Resources.PackageSearchViewSearchTextBox}"/>
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding SearchState}" Value="Syncing">
+                        <Setter Property="Text" Value="{x:Static p:Resources.PackageSearchViewPleaseWait}"/>
+                    </DataTrigger>
+                    <DataTrigger  Binding="{Binding Path=SearchText, Converter={StaticResource NonEmptyStringToCollapsedConverter}}" Value="Collapsed">
+                        <Setter Property="Visibility" Value="Collapsed"/>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+
             <!-- An unstyled button -->
             <Style x:Key="FlatButton" TargetType="Button">
                 <Setter Property="Background" Value="{x:Null}" />

From e13fd3f42cbe930632b6758c8a2faf690a977d7f Mon Sep 17 00:00:00 2001
From: "GLOBAL\\ryan.porter" <ryan.porter@arup.com>
Date: Mon, 18 Mar 2019 09:44:22 +0000
Subject: [PATCH 2/8] Applied styles to text boxes.

---
 .../Views/PackageManager/PackageManagerSearchView.xaml    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
index 2b69f28b271..c637499b504 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -149,15 +149,13 @@
                     <ColumnDefinition Width="Auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
-                <TextBox Grid.Column="0" Name="SearchTextBox" KeyboardNavigation.TabIndex="0" Foreground="WhiteSmoke" Background="#222" BorderThickness="0" FontSize ="13" Padding="10,10,5,10" Margin ="0"
+                <TextBox Style="{DynamicResource PackageSearchTextBox}" Grid.Column="0" Name="SearchTextBox" KeyboardNavigation.TabIndex="0" Foreground="WhiteSmoke" Background="#222" BorderThickness="0" FontSize ="13" Padding="10,10,5,10" Margin ="0"
                        IsEnabled="True" TextChanged="SearchTextBox_TextChanged" VerticalAlignment="Stretch" Text="{Binding Path=SearchText, Mode=TwoWay}">
                 </TextBox>
 
-                <TextBlock Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent" 
+                <TextBlock Style="{DynamicResource PackageSearchTextBlock}" Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent" 
                            Foreground="#666" 
-                           IsHitTestVisible="False"
-                           Visibility="{Binding Path=SearchText, Converter={StaticResource NonEmptyStringToCollapsedConverter}}"
-                           Text="{x:Static p:Resources.PackageSearchViewSearchTextBox}"/>
+                           IsHitTestVisible="False"/>
 
                 <Button Width="auto" MinWidth="80" Grid.Column="1" Click="OnSortButtonClicked"
                         Style="{DynamicResource ResourceKey=STextButton}" Content="{x:Static p:Resources.PackageSearchViewSortByButton}">

From 909e0bc7e341a823b12c44aa51504215489b4aec Mon Sep 17 00:00:00 2001
From: "GLOBAL\\ryan.porter" <ryan.porter@arup.com>
Date: Mon, 18 Mar 2019 10:16:56 +0000
Subject: [PATCH 3/8] Swapped grey background colour from search text box to
 search box grid. Both text boxes now have transparent backgrounds, caret
 brush set to white (otherwise it's black).

---
 .../Views/PackageManager/PackageManagerSearchView.xaml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
index c637499b504..47c06435c02 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -142,18 +142,18 @@
 
             <TextBlock Grid.Row ="1" Grid.ZIndex ="1" FontSize="13" HorizontalAlignment="Center" Foreground="Gray" VerticalAlignment="Center" Name="NoResultsIndicator" TextAlignment="Center" Margin="20" Text="{Binding Path=SearchState, Converter={StaticResource PackageSearchStateToStringConverter}}"/>
 
-            <Grid Name="RSearchBoxStackPanel" Grid.Row="0">
+            <Grid Name="RSearchBoxStackPanel" Grid.Row="0" Background="#222">
 
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"></ColumnDefinition>
                     <ColumnDefinition Width="Auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
-                <TextBox Style="{DynamicResource PackageSearchTextBox}" Grid.Column="0" Name="SearchTextBox" KeyboardNavigation.TabIndex="0" Foreground="WhiteSmoke" Background="#222" BorderThickness="0" FontSize ="13" Padding="10,10,5,10" Margin ="0"
+                <TextBox Style="{DynamicResource PackageSearchTextBox}" Grid.Column="0" Name="SearchTextBox" KeyboardNavigation.TabIndex="0" Foreground="WhiteSmoke" Background="Transparent" CaretBrush="White" BorderThickness="0" FontSize ="13" Padding="10,10,5,10" Margin ="0"
                        IsEnabled="True" TextChanged="SearchTextBox_TextChanged" VerticalAlignment="Stretch" Text="{Binding Path=SearchText, Mode=TwoWay}">
                 </TextBox>
 
-                <TextBlock Style="{DynamicResource PackageSearchTextBlock}" Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent" 
+                <TextBlock Style="{DynamicResource PackageSearchTextBlock}" Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent"
                            Foreground="#666" 
                            IsHitTestVisible="False"/>
 

From ceadfa97255c01fa664995bf192d5c35799b4b2d Mon Sep 17 00:00:00 2001
From: "GLOBAL\\ryan.porter" <ryan.porter@arup.com>
Date: Thu, 21 Mar 2019 12:39:52 +0000
Subject: [PATCH 4/8] Removed styles and add testable properties in the
 viewmodel instead to control component behaviour. Added old visibility
 converter to collpse search box prompt when text is being typed.

---
 .../PackageManagerSearchViewModel.cs          | 29 +++++++++++++++++
 .../PackageManagerSearchView.xaml             | 31 ++++---------------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index d8dbec90baf..be3114daada 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -82,6 +82,33 @@ public PackageSortingDirection SortingDirection
             }
         }
 
+        public string SearchBoxPrompt
+        {
+            get
+            {
+                if(SearchState == PackageSearchState.Syncing)
+                {
+                    return Resources.PackageSearchViewPleaseWait;
+                }
+                return Resources.PackageSearchViewSearchTextBox;
+            }
+        }
+
+        public bool ShowSearchText
+        {
+            get
+            {
+                if(SearchState == PackageSearchState.Syncing)
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+
         /// <summary>
         ///     SearchText property
         /// </summary>
@@ -156,6 +183,8 @@ public PackageSearchState SearchState
             {
                 _searchState = value;
                 RaisePropertyChanged("SearchState");
+                RaisePropertyChanged("SearchBoxPrompt");
+                RaisePropertyChanged("ShowSearchText");
             }
         }
 
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
index 47c06435c02..e6e60e57e63 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -13,26 +13,6 @@
     <Window.Resources>
         <ResourceDictionary>
 
-            <Style x:Key="PackageSearchTextBox" TargetType="TextBox">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding SearchState}" Value="Syncing">
-                        <Setter Property="Visibility" Value="Collapsed"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-
-            <Style x:Key="PackageSearchTextBlock" TargetType="TextBlock">
-                <Setter Property="Text" Value="{x:Static p:Resources.PackageSearchViewSearchTextBox}"/>
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding SearchState}" Value="Syncing">
-                        <Setter Property="Text" Value="{x:Static p:Resources.PackageSearchViewPleaseWait}"/>
-                    </DataTrigger>
-                    <DataTrigger  Binding="{Binding Path=SearchText, Converter={StaticResource NonEmptyStringToCollapsedConverter}}" Value="Collapsed">
-                        <Setter Property="Visibility" Value="Collapsed"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-
             <!-- An unstyled button -->
             <Style x:Key="FlatButton" TargetType="Button">
                 <Setter Property="Background" Value="{x:Null}" />
@@ -149,13 +129,14 @@
                     <ColumnDefinition Width="Auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
-                <TextBox Style="{DynamicResource PackageSearchTextBox}" Grid.Column="0" Name="SearchTextBox" KeyboardNavigation.TabIndex="0" Foreground="WhiteSmoke" Background="Transparent" CaretBrush="White" BorderThickness="0" FontSize ="13" Padding="10,10,5,10" Margin ="0"
-                       IsEnabled="True" TextChanged="SearchTextBox_TextChanged" VerticalAlignment="Stretch" Text="{Binding Path=SearchText, Mode=TwoWay}">
+                <TextBox Visibility="{Binding ShowSearchText, Converter={StaticResource BooleanToVisibilityConverter}}" Text="{Binding Path=SearchText, Mode=TwoWay}"
+                         Grid.Column="0" Name="SearchTextBox" KeyboardNavigation.TabIndex="0" Foreground="WhiteSmoke" Background="Transparent" CaretBrush="White" 
+                         BorderThickness="0" FontSize ="13" Padding="10,10,5,10" Margin ="0" TextChanged="SearchTextBox_TextChanged" VerticalAlignment="Stretch">
                 </TextBox>
 
-                <TextBlock Style="{DynamicResource PackageSearchTextBlock}" Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent"
-                           Foreground="#666" 
-                           IsHitTestVisible="False"/>
+                <TextBlock Text="{Binding SearchBoxPrompt}" Visibility="{Binding Path=SearchText, Converter={StaticResource NonEmptyStringToCollapsedConverter}}" 
+                           Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent" Foreground="#666" IsHitTestVisible="False">
+                </TextBlock>
 
                 <Button Width="auto" MinWidth="80" Grid.Column="1" Click="OnSortButtonClicked"
                         Style="{DynamicResource ResourceKey=STextButton}" Content="{x:Static p:Resources.PackageSearchViewSortByButton}">

From 01615c214c711f96a93b11803277b7000746d417 Mon Sep 17 00:00:00 2001
From: "GLOBAL\\ryan.porter" <ryan.porter@arup.com>
Date: Thu, 21 Mar 2019 12:56:55 +0000
Subject: [PATCH 5/8] Renamed string resource for "Please Wait..." to be a
 little bit more generic.

---
 src/DynamoCoreWpf/Properties/Resources.Designer.cs   | 12 ++++++------
 src/DynamoCoreWpf/Properties/Resources.en-US.resx    |  2 +-
 src/DynamoCoreWpf/Properties/Resources.resx          |  2 +-
 .../PackageManager/PackageManagerSearchViewModel.cs  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 2551d4283d4..931e47f107e 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -4003,20 +4003,20 @@ public class Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Please wait....
+        ///   Looks up a localized string similar to Search....
         /// </summary>
-        public static string PackageSearchViewPleaseWait {
+        public static string PackageSearchViewSearchTextBox {
             get {
-                return ResourceManager.GetString("PackageSearchViewPleaseWait", resourceCulture);
+                return ResourceManager.GetString("PackageSearchViewSearchTextBox", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search....
+        ///   Looks up a localized string similar to Please wait....
         /// </summary>
-        public static string PackageSearchViewSearchTextBox {
+        public static string PackageSearchViewSearchTextBoxSyncing {
             get {
-                return ResourceManager.GetString("PackageSearchViewSearchTextBox", resourceCulture);
+                return ResourceManager.GetString("PackageSearchViewSearchTextBoxSyncing", resourceCulture);
             }
         }
         
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 184f77f57f8..d2ef3a500bb 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2184,7 +2184,7 @@ Do you want to install the latest Dynamo update?</value>
   <data name="RerunButtonToolTip" xml:space="preserve">
     <value>Rerun the graph.</value>
   </data>
-  <data name="PackageSearchViewPleaseWait" xml:space="preserve">
+  <data name="PackageSearchViewSearchTextBoxSyncing" xml:space="preserve">
     <value>Please wait...</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 88b5461d29d..eeadef70dc8 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2187,7 +2187,7 @@ Want to publish a different package?</value>
   <data name="CrashPromptGithubNewIssueTitle" xml:space="preserve">
     <value>Crash report from Dynamo {0}</value>
   </data>
-  <data name="PackageSearchViewPleaseWait" xml:space="preserve">
+  <data name="PackageSearchViewSearchTextBoxSyncing" xml:space="preserve">
     <value>Please wait...</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index be3114daada..ec2462c689b 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -88,7 +88,7 @@ public string SearchBoxPrompt
             {
                 if(SearchState == PackageSearchState.Syncing)
                 {
-                    return Resources.PackageSearchViewPleaseWait;
+                    return Resources.PackageSearchViewSearchTextBoxSyncing;
                 }
                 return Resources.PackageSearchViewSearchTextBox;
             }

From 5f952c803e20079644a0cc08b9ac289b06e44aa5 Mon Sep 17 00:00:00 2001
From: "GLOBAL\\ryan.porter" <ryan.porter@arup.com>
Date: Thu, 21 Mar 2019 12:57:10 +0000
Subject: [PATCH 6/8] Added unit tests to test search box behaviour based on
 different search states.

---
 .../PackageManagerUITests.cs                  | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/test/DynamoCoreWpfTests/PackageManagerUITests.cs b/test/DynamoCoreWpfTests/PackageManagerUITests.cs
index 130969c996b..5cc49f133ab 100644
--- a/test/DynamoCoreWpfTests/PackageManagerUITests.cs
+++ b/test/DynamoCoreWpfTests/PackageManagerUITests.cs
@@ -158,6 +158,84 @@ public void PackageSearchDialogClosesWithDynamo()
 
         }
 
+        [Test]
+        public void PackageSearchDialogSearchTextCollapsedWhileSyncing()
+        {
+            // Arrange
+            PackageManagerSearchViewModel searchViewModel = new PackageManagerSearchViewModel();
+
+            // Act
+            searchViewModel.SearchState = PackageManagerSearchViewModel.PackageSearchState.Syncing;
+
+            // Assert
+            Assert.AreEqual(false, searchViewModel.ShowSearchText);
+        }
+
+        [Test]
+        public void PackageSearchDialogSearchTextVisibleWithResults()
+        {
+            // Arrange
+            PackageManagerSearchViewModel searchViewModel = new PackageManagerSearchViewModel();
+
+            // Act
+            searchViewModel.SearchState = PackageManagerSearchViewModel.PackageSearchState.Results;
+
+            // Assert
+            Assert.AreEqual(true, searchViewModel.ShowSearchText);
+        }
+
+        [Test]
+        public void PackageSearchDialogSearchTextVisibleWhenSearching()
+        {
+            // Arrange
+            PackageManagerSearchViewModel searchViewModel = new PackageManagerSearchViewModel();
+
+            // Act
+            searchViewModel.SearchState = PackageManagerSearchViewModel.PackageSearchState.Searching;
+
+            // Assert
+            Assert.AreEqual(true, searchViewModel.ShowSearchText);
+        }
+
+        [Test]
+        public void PackageSearchDialogSearchTextVisibleWhenNoResults()
+        {
+            // Arrange
+            PackageManagerSearchViewModel searchViewModel = new PackageManagerSearchViewModel();
+
+            // Act
+            searchViewModel.SearchState = PackageManagerSearchViewModel.PackageSearchState.NoResults;
+
+            // Assert
+            Assert.AreEqual(true, searchViewModel.ShowSearchText);
+        }
+
+        [Test]
+        public void PackageSearchDialogSearchBoxPromptTextWhileSyncing()
+        {
+            // Arrange
+            PackageManagerSearchViewModel searchViewModel = new PackageManagerSearchViewModel();
+
+            // Act
+            searchViewModel.SearchState = PackageManagerSearchViewModel.PackageSearchState.Syncing;
+
+            // Assert
+            Assert.AreEqual(Dynamo.Wpf.Properties.Resources.PackageSearchViewSearchTextBoxSyncing, searchViewModel.SearchBoxPrompt);
+        }
+
+        [Test]
+        public void PackageSearchDialogSearchBoxPromptTextWhenNotSyncing()
+        {
+            // Arrange
+            PackageManagerSearchViewModel searchViewModel = new PackageManagerSearchViewModel();
+
+            // Act
+            searchViewModel.SearchState = PackageManagerSearchViewModel.PackageSearchState.Results;
+
+            // Assert
+            Assert.AreEqual(Dynamo.Wpf.Properties.Resources.PackageSearchViewSearchTextBox, searchViewModel.SearchBoxPrompt);
+        }
+
         #endregion
 
     }

From dee3a2deb4ddfabc9d1be3edf1b8b60a721255d1 Mon Sep 17 00:00:00 2001
From: "GLOBAL\\Ryan.Porter" <ryan.porter@arup.com>
Date: Fri, 22 Mar 2019 12:08:22 +0000
Subject: [PATCH 7/8] Added property summaries. Replaced property name strings
 with nameof

---
 .../PackageManagerSearchViewModel.cs          | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index ec2462c689b..2cc14213fb5 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -82,6 +82,9 @@ public PackageSortingDirection SortingDirection
             }
         }
 
+        /// <summary>
+        /// The string that is displayed in the search box prompt depending on the search state.
+        /// </summary>
         public string SearchBoxPrompt
         {
             get
@@ -94,6 +97,12 @@ public string SearchBoxPrompt
             }
         }
 
+        /// <summary>
+        /// Determines whether the the search text box should be displayed.
+        /// <para>
+        /// Returns false if the search state is syncing, 
+        /// </para>
+        /// </summary>
         public bool ShowSearchText
         {
             get
@@ -172,19 +181,21 @@ public bool HasNoResults
             get { return this.SearchResults.Count == 0; }
         }
 
+
+        public PackageSearchState _searchState;
+
         /// <summary>
         /// Gives the current state of search.
         /// </summary>
-        public PackageSearchState _searchState;
         public PackageSearchState SearchState
         {
             get { return _searchState; }
             set
             {
                 _searchState = value;
-                RaisePropertyChanged("SearchState");
-                RaisePropertyChanged("SearchBoxPrompt");
-                RaisePropertyChanged("ShowSearchText");
+                RaisePropertyChanged(nameof(this.SearchState));
+                RaisePropertyChanged(nameof(this.SearchBoxPrompt));
+                RaisePropertyChanged(nameof(this.ShowSearchText));
             }
         }
 

From fd67269076b07ef3707d336332b4cc5fe5c8fb2a Mon Sep 17 00:00:00 2001
From: "GLOBAL\\Ryan.Porter" <ryan.porter@arup.com>
Date: Wed, 17 Apr 2019 09:00:10 +0100
Subject: [PATCH 8/8] Added comments on non-private backing fields.

---
 .../PackageManager/PackageManagerSearchViewModel.cs       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index 2cc14213fb5..99ac1b20ec4 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -53,7 +53,7 @@ public enum PackageSortingDirection
         /// <value>
         ///     Set which kind of sorting should be used for displaying search results
         /// </value>
-        public PackageSortingKey _sortingKey;
+        public PackageSortingKey _sortingKey; // TODO: Set private for 3.0.
         public PackageSortingKey SortingKey
         {
             get { return _sortingKey; }
@@ -71,7 +71,7 @@ public PackageSortingKey SortingKey
         /// <value>
         ///     Set which kind of sorting should be used for displaying search results
         /// </value>
-        public PackageSortingDirection _sortingDirection;
+        public PackageSortingDirection _sortingDirection; // TODO: Set private for 3.0.
         public PackageSortingDirection SortingDirection
         {
             get { return _sortingDirection; }
@@ -124,7 +124,7 @@ public bool ShowSearchText
         /// <value>
         ///     This is the core UI for Dynamo, primarily used for logging.
         /// </value>
-        public string _SearchText;
+        public string _SearchText; // TODO: Set private for 3.0.
         public string SearchText
         {
             get { return _SearchText; }
@@ -182,7 +182,7 @@ public bool HasNoResults
         }
 
 
-        public PackageSearchState _searchState;
+        public PackageSearchState _searchState; // TODO: Set private for 3.0.
 
         /// <summary>
         /// Gives the current state of search.