Merge pull request #1071 from hargata/Hargata/make.search.optional

make garage search optional

Author: hargata

Helper/ConfigHelper.cs

@@ -392,7 +392,8 @@ public UserConfig GetUserConfig(ClaimsPrincipal user)
                 TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>() ?? new UserConfig().TabOrder,
                 UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
                 DefaultTab = (ImportMode)int.Parse(CheckString(nameof(UserConfig.DefaultTab), "8")),
-                ShowVehicleThumbnail = CheckBool(CheckString(nameof(UserConfig.ShowVehicleThumbnail)))
+                ShowVehicleThumbnail = CheckBool(CheckString(nameof(UserConfig.ShowVehicleThumbnail))),
+                ShowSearch = CheckBool(CheckString(nameof(UserConfig.ShowSearch)))
             };
             int userId = 0;
             if (user != null)

Models/UserConfig.cs

@@ -24,6 +24,7 @@ public class UserConfig
         public bool UseUnitForFuelCost { get; set; }
         public bool ShowCalendar { get; set; }
         public bool ShowVehicleThumbnail { get; set; }
+        public bool ShowSearch { get; set; }
         public List<UserColumnPreference> UserColumnPreferences { get; set; } = new List<UserColumnPreference>();
         public string UserNameHash { get; set; }
         public string UserPasswordHash { get; set;}

Views/Home/_GarageDisplay.cshtml

@@ -6,31 +6,40 @@
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
     var recordTags = Model.SelectMany(x => x.Tags).Distinct();
+    var tagsExist = recordTags.Any();
+    var searchExist = userConfig.ShowSearch && Model.Count() > 1;
+    var renderTopRow = tagsExist || searchExist;
 }
-@if (recordTags.Any())
+@if (renderTopRow)
 {
     <div class='row'>
-        <div class="col-xl-10 col-lg-9 col-md-8 col-sm-8 col-12 d-flex align-items-center flex-wrap mb-2">
-            @foreach (string recordTag in recordTags)
-            {
-                <span onclick="filterGarage(this)" class="user-select-none ms-1 me-1 mt-1 mb-1 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
-            }
-            <datalist id="tagList">
+        @if (tagsExist)
+        {
+            <div class="@(searchExist ? "col-xl-10 col-lg-9 col-md-8 col-sm-8" : "") col-12 d-flex align-items-center flex-wrap mb-2">
                 @foreach (string recordTag in recordTags)
                 {
-                    <!option value="@recordTag"></!option>
+                    <span onclick="filterGarage(this)" class="user-select-none ms-1 me-1 mt-1 mb-1 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
                 }
-            </datalist>
-        </div>
-        <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-12 pt-2 pb-2">
-            <div class="input-group">
-                <input type="text" id="garageSearchInput" class="form-control" onkeyup="handleGarageSearchKeyPress(event)" placeholder="@translator.Translate(userLanguage, "Search")" />
-                <button type="button" class="btn btn-outline-secondary" onclick="searchGarage()"><i class="bi bi-search"></i></button>
+                <datalist id="tagList">
+                    @foreach (string recordTag in recordTags)
+                    {
+                        <!option value="@recordTag"></!option>
+                    }
+                </datalist>
             </div>
-        </div>
+        }
+        @if (searchExist)
+        {
+            <div class="@(tagsExist ? "col-xl-2 col-lg-3 col-md-4 col-sm-4" : "") col-12 pt-2 pb-2">
+                <div class="input-group">
+                    <input type="text" id="garageSearchInput" class="form-control" onkeyup="handleGarageSearchKeyPress(event)" placeholder="@translator.Translate(userLanguage, "Search")" />
+                    <button type="button" class="btn btn-outline-secondary" onclick="searchGarage()"><i class="bi bi-search"></i></button>
+                </div>
+            </div>
+        }
     </div>
 }
-    <div class="row gy-3 align-items-stretch vehiclesContainer pb-2 @(recordTags.Any() ? "" : "mt-2")">
+<div class="row gy-3 align-items-stretch vehiclesContainer pb-2 @(renderTopRow ? "" : "mt-2")">
         @foreach (VehicleViewModel vehicle in Model)
         {
             @if (!(userConfig.HideSoldVehicles && !string.IsNullOrWhiteSpace(vehicle.SoldDate)))

Views/Home/_Settings.cshtml

@@ -57,6 +57,10 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="showVehicleThumbnail" checked="@Model.UserConfig.ShowVehicleThumbnail">
             <label class="form-check-label" for="showVehicleThumbnail">@translator.Translate(userLanguage, "Show Vehicle Thumbnail in Header")</label>
         </div>
+        <div class="form-check form-switch form-check-inline">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="showGarageSearch" checked="@Model.UserConfig.ShowSearch">
+            <label class="form-check-label" for="showGarageSearch">@translator.Translate(userLanguage, "Show Garage Search")</label>
+        </div>
         <hr />
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useMPG" checked="@Model.UserConfig.UseMPG">

wwwroot/defaults/en_US.json

@@ -60,6 +60,7 @@ function updateSettings() {
         enableShopSupplies: $("#enableShopSupplies").is(":checked"),
         showCalendar: $("#showCalendar").is(":checked"),
         showVehicleThumbnail: $("#showVehicleThumbnail").is(":checked"),
+        showSearch: $("#showGarageSearch").is(":checked"),
         enableExtraFieldColumns: $("#enableExtraFieldColumns").is(":checked"),
         hideSoldVehicles: $("#hideSoldVehicles").is(":checked"),
         preferredGasUnit: $("#preferredGasUnit").val(),