consolidated settings into confighelper, fixed shop supplies access issue for non root user.

Controllers/VehicleController.cs

@@ -1518,7 +1518,10 @@ namespace CarCareTracker.Controllers
         public IActionResult GetSupplyRecordsForRecordsByVehicleId(int vehicleId)
         {
             var result = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
-            result.AddRange(_supplyRecordDataAccess.GetSupplyRecordsByVehicleId(0)); // add shop supplies
+            if (_config.GetServerEnableShopSupplies())
+            {
+                result.AddRange(_supplyRecordDataAccess.GetSupplyRecordsByVehicleId(0)); // add shop supplies
+            }
             result.RemoveAll(x => x.Quantity <= 0);
             bool _useDescending = _config.GetUserConfig(User).UseDescending;
             if (_useDescending)

Filter/CollaboratorFilter.cs

@@ -17,10 +17,13 @@ namespace CarCareTracker.Filter
             if (!filterContext.HttpContext.User.IsInRole(nameof(UserData.IsRootUser)))
             {
                 var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
-                var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                if (vehicleId != default)
-                if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
                 {
-                    filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                    if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
+                    {
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    }
                 }
             }
         }

Helper/ConfigHelper.cs

@@ -11,6 +11,7 @@ namespace CarCareTracker.Helper
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         string GetLogoUrl();
         string GetServerLanguage();
+        bool GetServerEnableShopSupplies();
         public bool DeleteUserConfig(int userId);
     }
     public class ConfigHelper : IConfigHelper
@@ -40,6 +41,10 @@ namespace CarCareTracker.Helper
             var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
             return serverLanguage;
         }
+        public bool GetServerEnableShopSupplies()
+        {
+            return bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)] ?? "false");
+        }
         public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
         {
             var storedUserId = user.FindFirstValue(ClaimTypes.NameIdentifier);

Views/Home/Index.cshtml

@@ -1,6 +1,5 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
-@inject IConfiguration serverConfig
 @inject ITranslationHelper translator
 @{
     var userConfig = config.GetUserConfig(User);
@@ -22,7 +21,7 @@
         <li class="nav-item" role="presentation">
             <button class="nav-link user-select-none @(Model == "garage" ? "active" : "")" ontouchstart="detectLongTouch(this)" ontouchend="detectTouchEndPremature(this)" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-car-front me-2"></i>@translator.Translate(userLanguage,"Garage")</span></button>
         </li>
-        @if(bool.Parse(serverConfig[nameof(UserConfig.EnableShopSupplies)] ?? "false"))
+        @if(config.GetServerEnableShopSupplies())
         {
             <li class="nav-item" role="presentation">
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>
@@ -59,7 +58,7 @@
         <li class="nav-item" role="presentation">
             <button class="nav-link @(Model == "garage" ? "active" : "")" oncontextmenu="sortGarage(this)" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><i class="bi bi-car-front me-2"></i>@translator.Translate(userLanguage,"Garage")</button>
         </li>
-        @if (bool.Parse(serverConfig[nameof(UserConfig.EnableShopSupplies)] ?? "false"))
+        @if (config.GetServerEnableShopSupplies())
         {
             <li class="nav-item" role="presentation">
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</button>

Views/Vehicle/_SupplyUsage.cshtml

@@ -24,7 +24,8 @@
                             <th scope="col" class="col-1"></th>
                             <th scope="col" class="col-2">@translator.Translate(userLanguage,"Quantity")</th>
                             <th scope="col" class="col-2">@translator.Translate(userLanguage, "In Stock")</th>
-                            <th scope="col" class="col-5">@translator.Translate(userLanguage, "Description")</th>
+                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Part Number")</th>
+                            <th scope="col" class="col-3">@translator.Translate(userLanguage, "Description")</th>
                             <th scope="col" class="col-2">@translator.Translate(userLanguage, "Unit Cost")</th>
                         </tr>
                     </thead>
@@ -35,7 +36,8 @@
                                 <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id"></td>
                                 <td class="col-2"><input type="text" disabled onchange="recalculateTotal()" class="form-control"></td>
                                 <td class="col-2 supplyquantity">@supplyRecord.Quantity</td>
-                                <td class="col-5">@supplyRecord.Description</td>
+                                <td class="col-2 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.PartNumber)</td>
+                                <td class="col-3 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.Description)</td>
                                 <td class="col-2 supplyprice">@((supplyRecord.Quantity > 0 ? supplyRecord.Cost / supplyRecord.Quantity : 0).ToString("F"))</td>
                             </tr>
                         }