wip

Wonky.Client/Components/ActivityTableComponent.razor

@@ -38,8 +38,4 @@
         }
         </tbody>
     </table>
-}
-else
-{
-    <AppSpinner/>
 }

Wonky.Client/Components/CompanySearchColumnComponent.razor.cs

@@ -22,7 +22,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class CompanySearchComponent : IDisposable
+public partial class CompanySearchColumnComponent : IDisposable
 {
     [Inject] private ILocalStorageService LocalStorage { get; set; }
     [Inject] private UserPreferenceService UserPreferenceService { get; set; }

Wonky.Client/Components/SearchPhraseComponent.razor.cs

@@ -19,7 +19,7 @@ using Timer = System.Timers.Timer;
 
 namespace Wonky.Client.Components
 {
-    public partial class SearchPhrase
+    public partial class SearchPhraseComponent
     {
         private Timer _timer = new();
         private string SearchTerm { get; set; } = "";

Wonky.Client/Pages/ActivityCompanyCreate.razor

@@ -138,7 +138,7 @@
                     <ItemSearchComponent OnChanged="SetSearchCol"/>
                 </div>
                 <div class="col">
-                    <SearchPhrase OnChanged="SetSearchPhrase"/>
+                    <SearchPhraseComponent OnChanged="SetSearchPhrase"/>
                 </div>
                 <div class="col">
                     <ItemSortComponent OnChanged="SetSortCol"/>

Wonky.Client/Pages/CompanyList.razor

@@ -24,10 +24,10 @@
 <div class="container">
     <div class="row mb-3">
         <div class="col-md-3">
-            <CompanySearchComponent OnChanged="SetSearchCol"/>
+            <CompanySearchColumnComponent OnChanged="SetSearchCol"/>
         </div>
         <div class="col-md-3">
-            <SearchPhrase SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
+            <SearchPhraseComponent SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
         </div>
         <div class="col-md-3">
             <CompanySortComponent OnChanged="SetSortCol"/>

Wonky.Client/Pages/CompanyList.razor.cs

@@ -46,9 +46,11 @@ namespace Wonky.Client.Pages
             _paging.SearchColumn = _preferences.CompanySearch;
             _paging.PageSize = Convert.ToInt32(_preferences.PageSize);
             
+            // load saved search
             _savedSearch = string.IsNullOrWhiteSpace(_preferences.CompanyFilterPhrase) 
                 ? "" : _preferences.CompanyFilterPhrase;
-            _paging.SearchTerm = _savedSearch;
+            if(!string.IsNullOrWhiteSpace(_savedSearch))
+                _paging.SearchTerm = _savedSearch;
             
             Interceptor.RegisterEvent();
             Interceptor.RegisterBeforeSendEvent();
@@ -82,6 +84,7 @@ namespace Wonky.Client.Pages
         {
             if(string.IsNullOrWhiteSpace(searchTerm))
                 await UserPrefService.SetCompanyFilterPhrase("");
+            
             Companies = new List<CompanyDto>();
             _paging.PageNumber = 1;
             _paging.SearchTerm = searchTerm;

Wonky.Client/Pages/ItemCatalog.razor

@@ -29,7 +29,7 @@
         <ItemSearchComponent OnChanged="SetSearchCol"/>
     </div>
     <div class="col">
-        <SearchPhrase OnChanged="SetSearchPhrase"/>
+        <SearchPhraseCompanonent OnChanged="SetSearchPhrase"/>
     </div>
     <div class="col">
         <ItemSortComponent OnChanged="SetSortCol"/>

Wonky.Client/Services/UserPreferenceService.cs

@@ -4,11 +4,11 @@ namespace Wonky.Client.Services;
 
 public record Preferences
 {
+    public string? CompanyFilterPhrase { get; set; } = "";
     public string? CompanySearch { get; set; } = "name";
     public string? CompanySort { get; set; } = "name";
     public string? ItemSearch { get; set; } = "name";
     public string? ItemSort { get; set; } = "name";
-    public string? CompanyFilterPhrase { get; set; } = "";
     public string PageSize { get; set; } = "10";
     public string WorkDate { get; set; } = "";
 }