From 1f91bee61d2cf36a69965d0cf7286b63d4f0fd97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boris=20Mila=C5=A1inovi=C4=87?= <boris.milasinovic@fer.hr>
Date: Mon, 27 Apr 2026 00:30:31 +0200
Subject: [PATCH] Minor cleanup

---
 Events-MVC/Events.MVC/Controllers/CountriesController.cs  | 2 --
 Events-MVC/Events.MVC/Controllers/EventsController.cs     | 3 ---
 Events-MVC/Events.MVC/Controllers/PeopleController.cs     | 5 -----
 .../Events.MVC/Controllers/RegistrationsController.cs     | 8 --------
 Events-MVC/Events.MVC/Controllers/SportsController.cs     | 1 -
 Events-MVC/Events.MVC/Views/Shared/_Layout.cshtml         | 6 +++---
 .../People/PeopleService.cs                               | 1 -
 .../Views/Shared/_Layout.cshtml                           | 6 +++---
 .../Views/Shared/_ValidationScriptsPartial.cshtml         | 4 ++--
 .../MVC-SimpleCRUD/Controllers/PeopleController.cs        | 1 -
 .../MVC-SimpleCRUD/Views/People/_PersonForm.cshtml        | 2 +-
 MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_Layout.cshtml | 6 +++---
 .../Views/Shared/_ValidationScriptsPartial.cshtml         | 4 ++--
 13 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/Events-MVC/Events.MVC/Controllers/CountriesController.cs b/Events-MVC/Events.MVC/Controllers/CountriesController.cs
index e3c792b..210993b 100644
--- a/Events-MVC/Events.MVC/Controllers/CountriesController.cs
+++ b/Events-MVC/Events.MVC/Controllers/CountriesController.cs
@@ -44,7 +44,6 @@ public class CountriesController : Controller
     public async Task<IActionResult> Row(string id)
     {
         var country = await ctx.Countries
-            .AsNoTracking()
             .Select(c => new CountryViewModel
             {
                 Code = c.Code,
@@ -196,7 +195,6 @@ public class CountriesController : Controller
         var nameFilter = SieveModelExtensions.ExtractFilterValue(normalizedFilters, "Name");
 
         var baseQuery = ctx.Countries
-            .AsNoTracking()
             .Select(c => new CountryViewModel
             {
                 Code = c.Code,
diff --git a/Events-MVC/Events.MVC/Controllers/EventsController.cs b/Events-MVC/Events.MVC/Controllers/EventsController.cs
index b2470dc..5206e68 100644
--- a/Events-MVC/Events.MVC/Controllers/EventsController.cs
+++ b/Events-MVC/Events.MVC/Controllers/EventsController.cs
@@ -44,7 +44,6 @@ public class EventsController : Controller
     public async Task<IActionResult> Row(int id)
     {
         var eventModel = await ctx.Events
-            .AsNoTracking()
             .Select(e => new EventViewModel
             {
                 Id = e.Id,
@@ -66,7 +65,6 @@ public class EventsController : Controller
     public async Task<IActionResult> EditRow(int id)
     {
         var eventModel = await ctx.Events
-            .AsNoTracking()
             .Select(e => new EventViewModel
             {
                 Id = e.Id,
@@ -194,7 +192,6 @@ public class EventsController : Controller
         var nameFilter = SieveModelExtensions.ExtractFilterValue(normalizedFilters, "Name");
 
         var baseQuery = ctx.Events
-            .AsNoTracking()
             .Select(e => new EventViewModel
             {
                 Id = e.Id,
diff --git a/Events-MVC/Events.MVC/Controllers/PeopleController.cs b/Events-MVC/Events.MVC/Controllers/PeopleController.cs
index 8dce544..3173383 100644
--- a/Events-MVC/Events.MVC/Controllers/PeopleController.cs
+++ b/Events-MVC/Events.MVC/Controllers/PeopleController.cs
@@ -57,7 +57,6 @@ public class PeopleController : Controller
     public async Task<IActionResult> Row(int id)
     {
         var person = await ctx.People
-            .AsNoTracking()
             .Select(p => new PersonViewModel
             {
                 Id = p.Id,
@@ -85,7 +84,6 @@ public class PeopleController : Controller
     public async Task<IActionResult> EditRow(int id)
     {
         var person = await ctx.People
-            .AsNoTracking()
             .Select(p => new PersonViewModel
             {
                 Id = p.Id,
@@ -198,7 +196,6 @@ public class PeopleController : Controller
         await ctx.SaveChangesAsync();
 
         var rowModel = await ctx.People
-            .AsNoTracking()
             .Where(p => p.Id == id)
             .Select(p => new PersonViewModel
             {
@@ -263,7 +260,6 @@ public class PeopleController : Controller
         var countryFilter = SieveModelExtensions.ExtractFilterValue(normalizedFilters, "CountryCode", "==");
 
         var baseQuery = ctx.People
-            .AsNoTracking()
             .Select(p => new PersonViewModel
             {
                 Id = p.Id,
@@ -323,7 +319,6 @@ public class PeopleController : Controller
     private async Task<List<SelectListItem>> GetCountryOptionsAsync(string? selectedCode = null)
     {
         return await ctx.Countries
-            .AsNoTracking()
             .OrderBy(c => c.Name)
             .Select(c => new SelectListItem
             {
diff --git a/Events-MVC/Events.MVC/Controllers/RegistrationsController.cs b/Events-MVC/Events.MVC/Controllers/RegistrationsController.cs
index 955c23d..c89977e 100644
--- a/Events-MVC/Events.MVC/Controllers/RegistrationsController.cs
+++ b/Events-MVC/Events.MVC/Controllers/RegistrationsController.cs
@@ -73,7 +73,6 @@ public class RegistrationsController : Controller
     public async Task<IActionResult> Row(int id, int eventId)
     {
         var registration = await ctx.Registrations
-            .AsNoTracking()
             .Where(r => r.Id == id && r.EventId == eventId)
             .Select(r => new RegistrationViewModel
             {
@@ -102,7 +101,6 @@ public class RegistrationsController : Controller
     public async Task<IActionResult> EditRow(int id, int eventId)
     {
         var registration = await ctx.Registrations
-            .AsNoTracking()
             .Where(r => r.Id == id && r.EventId == eventId)
             .Select(r => new RegistrationViewModel
             {
@@ -133,7 +131,6 @@ public class RegistrationsController : Controller
 
         var searchTerm = personLookup.Trim().ToLowerInvariant();
         var query = ctx.People
-            .AsNoTracking()
             .Where(p =>
                 p.FirstNameTranscription.ToLower().Contains(searchTerm) ||
                 p.LastNameTranscription.ToLower().Contains(searchTerm) ||
@@ -228,7 +225,6 @@ public class RegistrationsController : Controller
         await ctx.SaveChangesAsync();
 
         var rowModel = await ctx.Registrations
-            .AsNoTracking()
             .Where(r => r.Id == id)
             .Select(r => new RegistrationViewModel
             {
@@ -283,7 +279,6 @@ public class RegistrationsController : Controller
         var countryFilter = SieveModelExtensions.ExtractFilterValue(normalizedFilters, "CountryCode", "==");
 
         var baseQuery = ctx.Registrations
-            .AsNoTracking()
             .Where(r => r.EventId == selectedEventId)
             .Select(r => new RegistrationViewModel
             {
@@ -359,7 +354,6 @@ public class RegistrationsController : Controller
         if (model.PersonId > 0)
         {
             model.PersonLookup = await ctx.People
-                .AsNoTracking()
                 .Where(p => p.Id == model.PersonId)
                 .Select(p => p.FirstName + " " + p.LastName + " (" + p.FirstNameTranscription + " " + p.LastNameTranscription + ")")
                 .FirstOrDefaultAsync() ?? string.Empty;
@@ -370,7 +364,6 @@ public class RegistrationsController : Controller
         }
 
         model.SportOptions = await ctx.Sports
-            .AsNoTracking()
             .OrderBy(s => s.Name)
             .Select(s => new SelectListItem
             {
@@ -409,7 +402,6 @@ public class RegistrationsController : Controller
     private async Task<List<SelectListItem>> GetCountryOptionsAsync(string? selectedCountryCode)
     {
         return await ctx.Countries
-            .AsNoTracking()
             .OrderBy(c => c.Name)
             .Select(c => new SelectListItem
             {
diff --git a/Events-MVC/Events.MVC/Controllers/SportsController.cs b/Events-MVC/Events.MVC/Controllers/SportsController.cs
index cb071f6..4573732 100644
--- a/Events-MVC/Events.MVC/Controllers/SportsController.cs
+++ b/Events-MVC/Events.MVC/Controllers/SportsController.cs
@@ -183,7 +183,6 @@ public class SportsController : Controller
         var nameFilter = SieveModelExtensions.ExtractFilterValue(normalizedFilters, "Name");
 
         var baseQuery = ctx.Sports
-            .AsNoTracking()
             .Select(s => new SportViewModel
             {
                 Id = s.Id,
diff --git a/Events-MVC/Events.MVC/Views/Shared/_Layout.cshtml b/Events-MVC/Events.MVC/Views/Shared/_Layout.cshtml
index 91909b1..756707a 100644
--- a/Events-MVC/Events.MVC/Views/Shared/_Layout.cshtml
+++ b/Events-MVC/Events.MVC/Views/Shared/_Layout.cshtml
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData[Constants.ViewDataKeys.Title] - Events</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
 </head>
 <body class="bg-body-tertiary">
@@ -83,8 +83,8 @@
         </div>
     </div>
 
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="~/lib/htmx.org/dist/htmx.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
+    <script src="~/lib/htmx.org/dist/htmx.min.js" asp-append-version="true"></script>
     <script src="~/js/pager.js" asp-append-version="true"></script>
     <script>
         var toastVariantSuccess = @Html.Raw(System.Text.Json.JsonSerializer.Serialize(Constants.ToastVariants.Success));
diff --git a/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Application/People/PeopleService.cs b/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Application/People/PeopleService.cs
index 48ce0cf..402d390 100644
--- a/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Application/People/PeopleService.cs
+++ b/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Application/People/PeopleService.cs
@@ -95,7 +95,6 @@ public class PeopleService : IPeopleService
   public async Task<List<CountryOption>> GetCountryOptionsAsync()
   {
     return await ctx.Countries
-      .AsNoTracking()
       .OrderBy(d => d.Name)
       .Select(d => new CountryOption(d.Code, d.Name))
       .ToListAsync();
diff --git a/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_Layout.cshtml b/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_Layout.cshtml
index 5c6a9a8..2c83135 100644
--- a/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_Layout.cshtml
+++ b/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_Layout.cshtml
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>@ViewData["Title"] - Events</title>
-  <link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.min.css" asp-append-version="true" />
   <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
   @RenderSection("Styles", required: false)
 </head>
@@ -48,8 +48,8 @@
     </div>
   </div>
 
-  <script src="~/lib/jquery/jquery.min.js"></script>
-  <script src="~/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
+  <script src="~/lib/jquery/jquery.min.js" asp-append-version="true"></script>
+  <script src="~/lib/bootstrap/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
   <script src="~/js/site.js" asp-append-version="true"></script>
   <script src="~/js/pager.js" asp-append-version="true"></script>
   <script>             
diff --git a/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_ValidationScriptsPartial.cshtml b/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_ValidationScriptsPartial.cshtml
index d72a309..a856b18 100644
--- a/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/MVC-SimpleCRUD-Layered/MVC-SimpleCRUD-Layered.Web/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,2 +1,2 @@
-<script src="~/lib/jquery-validate/jquery.validate.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+<script src="~/lib/jquery-validate/jquery.validate.min.js" asp-append-version="true"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
diff --git a/MVC-SimpleCRUD/MVC-SimpleCRUD/Controllers/PeopleController.cs b/MVC-SimpleCRUD/MVC-SimpleCRUD/Controllers/PeopleController.cs
index 6e8f04c..a2da9b4 100644
--- a/MVC-SimpleCRUD/MVC-SimpleCRUD/Controllers/PeopleController.cs
+++ b/MVC-SimpleCRUD/MVC-SimpleCRUD/Controllers/PeopleController.cs
@@ -232,7 +232,6 @@ public class PeopleController : Controller
   private async Task PrepareDropDownLists(string? selectedCountryCode = null)
   {
     var countries = await ctx.Countries
-                          .AsNoTracking()
                           .OrderBy(d => d.Name)
                           .Select(d => new { d.Name, d.Code })
                           .ToListAsync();
diff --git a/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/People/_PersonForm.cshtml b/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/People/_PersonForm.cshtml
index 883d756..5ed9e72 100644
--- a/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/People/_PersonForm.cshtml
+++ b/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/People/_PersonForm.cshtml
@@ -51,7 +51,7 @@
       <div class="col-md-4">
         <label asp-for="CountryCode" class="form-label"></label>
         <select asp-for="CountryCode" asp-items="countries" class="form-select">
-          <option value="">Select country</option>
+          <option value="" disabled>Select country</option>
         </select>
         <span asp-validation-for="CountryCode" class="text-danger"></span>
       </div>
diff --git a/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_Layout.cshtml b/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_Layout.cshtml
index 5c6a9a8..2c83135 100644
--- a/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_Layout.cshtml
+++ b/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_Layout.cshtml
@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>@ViewData["Title"] - Events</title>
-  <link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.min.css" asp-append-version="true" />
   <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
   @RenderSection("Styles", required: false)
 </head>
@@ -48,8 +48,8 @@
     </div>
   </div>
 
-  <script src="~/lib/jquery/jquery.min.js"></script>
-  <script src="~/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
+  <script src="~/lib/jquery/jquery.min.js" asp-append-version="true"></script>
+  <script src="~/lib/bootstrap/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
   <script src="~/js/site.js" asp-append-version="true"></script>
   <script src="~/js/pager.js" asp-append-version="true"></script>
   <script>             
diff --git a/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_ValidationScriptsPartial.cshtml b/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_ValidationScriptsPartial.cshtml
index d72a309..e042e16 100644
--- a/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/MVC-SimpleCRUD/MVC-SimpleCRUD/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,2 +1,2 @@
-<script src="~/lib/jquery-validate/jquery.validate.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+<script src="~/lib/jquery-validate/jquery.validate.min.js" asp-append-version="true"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
\ No newline at end of file