diff --git a/Groceries/Common/TurboControllerExtensions.cs b/Groceries/Common/TurboControllerExtensions.cs deleted file mode 100644 index cfb1e9b..0000000 --- a/Groceries/Common/TurboControllerExtensions.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace Groceries.Common; - -using Microsoft.AspNetCore.Mvc; - -public static class TurboControllerExtensions -{ - public static TurboStreamResult TurboStream( - this Controller controller, - TurboStreamAction action, - string target, - object? model) - { - return controller.TurboStream(action, target, null, model); - } - - public static TurboStreamResult TurboStream( - this Controller controller, - TurboStreamAction action, - string target, - string? viewName, - object? model) - { - controller.ViewData.Model = model; - - return new TurboStreamResult(action, target) - { - ViewName = viewName, - ViewData = controller.ViewData, - TempData = controller.TempData, - }; - } -} diff --git a/Groceries/Common/TurboHttpRequestExtensions.cs b/Groceries/Common/TurboHttpRequestExtensions.cs deleted file mode 100644 index 89e51b2..0000000 --- a/Groceries/Common/TurboHttpRequestExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace Groceries.Common; - -public static class TurboHttpRequestExtensions -{ - public static bool IsTurboFrameRequest(this HttpRequest request) - { - return request.Headers.ContainsKey("Turbo-Frame"); - } - - public static bool IsTurboFrameRequest(this HttpRequest request, string frameId) - { - return request.Headers.TryGetValue("Turbo-Frame", out var values) && values.Contains(frameId); - } - - public static bool AcceptsTurboStream(this HttpRequest request) - { - return request.GetTypedHeaders().Accept.Any(value => value.MediaType == "text/vnd.turbo-stream.html"); - } -} diff --git a/Groceries/Common/TurboStreamResult.cs b/Groceries/Common/TurboStreamResult.cs deleted file mode 100644 index ba5949e..0000000 --- a/Groceries/Common/TurboStreamResult.cs +++ /dev/null @@ -1,182 +0,0 @@ -namespace Groceries.Common; - -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Controllers; -using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.Extensions.Options; -using System.Diagnostics; -using System.Globalization; - -public enum TurboStreamAction -{ - Append, - Prepend, - Replace, - Update, - Remove, - Before, - After, -} - -public class TurboStreamResult : ActionResult, IStatusCodeActionResult -{ - public TurboStreamResult(TurboStreamAction action, string target) - { - Action = action; - Target = target; - } - - public TurboStreamAction Action { get; set; } - - public string Target { get; set; } - - public string ContentType => "text/vnd.turbo-stream.html"; - - /// - /// Gets or sets the HTTP status code. - /// - public int? StatusCode { get; set; } - - /// - /// Gets or sets the name or path of the partial view that is rendered to the response. - /// - /// - /// When null, defaults to . - /// - public string? ViewName { get; set; } - - /// - /// Gets the view data model. - /// - public object? Model => ViewData.Model; - - /// - /// Gets or sets the for this result. - /// - public ViewDataDictionary ViewData { get; set; } = null!; - - /// - /// Gets or sets the for this result. - /// - public ITempDataDictionary TempData { get; set; } = null!; - - /// - /// Gets or sets the used to locate views. - /// - /// - /// When null, an instance of from - /// ActionContext.HttpContext.RequestServices is used. - /// - public IViewEngine? ViewEngine { get; set; } - - /// - public override Task ExecuteResultAsync(ActionContext context) - { - var services = context.HttpContext.RequestServices; - var executor = services.GetRequiredService>(); - return executor.ExecuteAsync(context, this); - } -} - -public class TurboStreamResultExecutor : PartialViewResultExecutor, IActionResultExecutor -{ - public TurboStreamResultExecutor( - IOptions viewOptions, - IHttpResponseStreamWriterFactory writerFactory, - ICompositeViewEngine viewEngine, - ITempDataDictionaryFactory tempDataFactory, - DiagnosticListener diagnosticListener, - ILoggerFactory loggerFactory, - IModelMetadataProvider modelMetadataProvider) - : base(viewOptions, writerFactory, viewEngine, tempDataFactory, diagnosticListener, loggerFactory, modelMetadataProvider) - { - } - - /// - public Task ExecuteAsync(ActionContext context, TurboStreamResult result) - { - var viewEngine = result.ViewEngine ?? ViewEngine; - var viewName = result.ViewName ?? GetActionName(context)!; - - var viewEngineResult = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: false); - var originalViewEngineResult = viewEngineResult; - if (!viewEngineResult.Success) - { - viewEngineResult = viewEngine.FindView(context, viewName, isMainPage: false); - } - - viewEngineResult.EnsureSuccessful(originalViewEngineResult.SearchedLocations); - - var action = result.Action.ToString().ToLowerInvariant(); - var preContent = result.Action switch - { - TurboStreamAction.Remove => $"\n", - _ => $"\n\n", - }; - - result.ViewData["RenderingToTurboStream"] = true; - - using var view = new WrapperView(viewEngineResult.View, preContent, postContent); - return ExecuteAsync(context, view, result.ViewData, result.TempData, result.ContentType, result.StatusCode); - } - - private static string? GetActionName(ActionContext context) - { - const string actionNameKey = "action"; - if (!context.RouteData.Values.TryGetValue(actionNameKey, out var routeValue)) - { - return null; - } - - string? normalizedValue = null; - if (context.ActionDescriptor.RouteValues.TryGetValue(actionNameKey, out var value) && !string.IsNullOrEmpty(value)) - { - normalizedValue = value; - } - - var stringRouteValue = Convert.ToString(routeValue, CultureInfo.InvariantCulture); - if (string.Equals(normalizedValue, stringRouteValue, StringComparison.OrdinalIgnoreCase)) - { - return normalizedValue; - } - - return stringRouteValue; - } -} - -public sealed class WrapperView : IDisposable, IView -{ - private readonly IView innerView; - private readonly string preContent; - private readonly string postContent; - - public WrapperView(IView innerView, string preContent, string postContent) - { - this.innerView = innerView; - this.preContent = preContent; - this.postContent = postContent; - } - - public string Path => string.Empty; - - public void Dispose() - { - (innerView as IDisposable)?.Dispose(); - } - - public async Task RenderAsync(ViewContext context) - { - context.Writer.Write(preContent); - await innerView.RenderAsync(context); - context.Writer.Write(postContent); - } -} diff --git a/Groceries/Common/_TurboStream.cshtml b/Groceries/Common/_TurboStream.cshtml deleted file mode 100644 index a873a41..0000000 --- a/Groceries/Common/_TurboStream.cshtml +++ /dev/null @@ -1,12 +0,0 @@ - - @if (ViewBag.Action != "remove") - { - - } - else - { - IgnoreBody(); - } - diff --git a/Groceries/Components/TablePaginator.razor b/Groceries/Components/TablePaginator.razor index 1f76c48..3774bee 100644 --- a/Groceries/Components/TablePaginator.razor +++ b/Groceries/Components/TablePaginator.razor @@ -26,7 +26,7 @@ @code { - [Parameter] + [Parameter, EditorRequired] public required IListPageModel Model { get; set; } private int FirstItem => Model.Count > 0 ? Model.Offset + 1 : 0; diff --git a/Groceries/HttpRequestExtensions.cs b/Groceries/HttpRequestExtensions.cs new file mode 100644 index 0000000..91ba443 --- /dev/null +++ b/Groceries/HttpRequestExtensions.cs @@ -0,0 +1,9 @@ +namespace Groceries; + +public static class HttpRequestExtensions +{ + public static bool IsTurboFrameRequest(this HttpRequest request, string frameId) + { + return request.Headers.TryGetValue("Turbo-Frame", out var values) && values.Contains(frameId); + } +} diff --git a/Groceries/Items/EditItem.cshtml b/Groceries/Items/EditItem.cshtml deleted file mode 100644 index 261394f..0000000 --- a/Groceries/Items/EditItem.cshtml +++ /dev/null @@ -1,25 +0,0 @@ -@using Groceries.Data -@model Item -@{ - Layout = ViewBag.RenderingToTurboStream == true ? null : "_Modal"; - ViewBag.Title = "Edit Item"; -} - -

Edit Item

- -
-
-
- -
-
- -
-
- -
-
- - - -
diff --git a/Groceries/Items/Index.cshtml b/Groceries/Items/Index.cshtml deleted file mode 100644 index 47e1a97..0000000 --- a/Groceries/Items/Index.cshtml +++ /dev/null @@ -1,55 +0,0 @@ -@using Groceries.Items -@model ItemListModel -@{ - ViewBag.Title = "Items"; -} - -
-

Items

-
- -
-
-
- @* Search icon *@ - -
- - -
-
-
-
- - -
- - - - - - - - @**@ - - - - @foreach (var item in Model.Items) - { - - - - - - @**@ - - } - -
BrandNameLast PurchasedBarcode
@item.Brand@item.Name - - @(item.HasBarcode ? "✓" : "") - Edit -
- -
- diff --git a/Groceries/Items/ItemListModel.cs b/Groceries/Items/ItemListModel.cs deleted file mode 100644 index b265bd3..0000000 --- a/Groceries/Items/ItemListModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Groceries.Items; - -public record ItemListModel(string? Search, ListPageModel Items) -{ - public record Item(Guid Id, string Brand, string Name) - { - public bool HasBarcode { get; init; } - public DateTime? LastPurchasedAt { get; init; } - } -} diff --git a/Groceries/Items/ItemsController.cs b/Groceries/Items/ItemsController.cs index 77687bb..d3b6f6c 100644 --- a/Groceries/Items/ItemsController.cs +++ b/Groceries/Items/ItemsController.cs @@ -1,86 +1,14 @@ namespace Groceries.Items; -using Groceries.Common; -using Groceries.Data; +using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; [Route("/items")] -public class ItemsController : Controller +public class ItemsController : ControllerBase { - private readonly AppDbContext dbContext; - - public ItemsController(AppDbContext dbContext) - { - this.dbContext = dbContext; - } - [HttpGet] - public async Task Index(int page, string? search) + public IResult Index() { - var itemsQuery = dbContext.Items.AsQueryable(); - if (!string.IsNullOrEmpty(search)) - { - var searchPattern = $"%{search}%"; - itemsQuery = itemsQuery.Where(item => EF.Functions.ILike(item.Brand + ' ' + item.Name, searchPattern)); - } - - var items = await itemsQuery - .OrderBy(item => item.Brand) - .ThenBy(item => item.Name) - .GroupJoin( - dbContext.ItemPurchases.Where(purchase => purchase.IsLastPurchase), - item => item.Id, - lastPurchase => lastPurchase.ItemId, - (item, lastPurchase) => new { item, lastPurchase }) - .SelectMany( - group => group.lastPurchase.DefaultIfEmpty(), - (group, lastPurchase) => new ItemListModel.Item(group.item.Id, group.item.Brand, group.item.Name) - { - HasBarcode = group.item.Barcodes.Count != 0, - LastPurchasedAt = lastPurchase != null ? lastPurchase.CreatedAt : null, - }) - .ToListPageModelAsync(page, cancellationToken: HttpContext.RequestAborted); - - if (items.Page != page) - { - return RedirectToAction(nameof(Index), new { page = items.Page, search }); - } - - var model = new ItemListModel(search, items); - return View(model); - } - - [HttpGet("{id}")] - public async Task EditItem(Guid id) - { - var item = await dbContext.Items - .SingleOrDefaultAsync(item => item.Id == id, HttpContext.RequestAborted); - - if (item == null) - { - return NotFound(); - } - - return View(item); - } - - [HttpPost("{id}")] - public async Task EditItem(Guid id, string brand, string name) - { - var item = await dbContext.Items - .SingleOrDefaultAsync(item => item.Id == id, HttpContext.RequestAborted); - - if (item == null) - { - return NotFound(); - } - - if (Request.AcceptsTurboStream()) - { - return this.TurboStream(TurboStreamAction.Replace, "modal-body", item); - } - - return RedirectToAction(nameof(EditItem)); + return new RazorComponentResult(); } } diff --git a/Groceries/Items/ItemsPage.razor b/Groceries/Items/ItemsPage.razor new file mode 100644 index 0000000..c50ea0d --- /dev/null +++ b/Groceries/Items/ItemsPage.razor @@ -0,0 +1,95 @@ +@using Groceries.Data +@using Microsoft.EntityFrameworkCore + +@layout Layout + +@inject AppDbContext DbContext +@inject NavigationManager Navigation +@inject IHttpContextAccessor HttpContextAccessor + +Groceries – Items + +
+

Items

+ + + +
+ + +
+ + + + + + + + @**@ + + + + @foreach (var item in items) + { + + + + + + @**@ + + } + +
BrandNameLast PurchasedBarcode
@item.Brand@item.Name + + @(item.HasBarcode ? "✓" : "") + Edit +
+ +
+ + +@code { + [SupplyParameterFromQuery] + public int? Page { get; set; } + + [SupplyParameterFromQuery] + public string? Search { get; set; } + + private record ItemModel(Guid Id, string Brand, string Name, bool HasBarcode, DateTime? LastPurchasedAt); + + private ListPageModel items = ListPageModel.Empty(); + + protected override async Task OnParametersSetAsync() + { + var itemsQuery = DbContext.Items.AsQueryable(); + if (!string.IsNullOrEmpty(Search)) + { + var searchPattern = $"%{Search}%"; + itemsQuery = itemsQuery.Where(item => EF.Functions.ILike(item.Brand + ' ' + item.Name, searchPattern)); + } + + items = await itemsQuery + .OrderBy(item => item.Brand) + .ThenBy(item => item.Name) + .GroupJoin( + DbContext.ItemPurchases.Where(purchase => purchase.IsLastPurchase), + item => item.Id, + lastPurchase => lastPurchase.ItemId, + (item, lastPurchase) => new { item, lastPurchase }) + .SelectMany( + group => group.lastPurchase.DefaultIfEmpty(), + (group, lastPurchase) => new ItemModel( + group.item.Id, + group.item.Brand, + group.item.Name, + group.item.Barcodes.Count != 0, + lastPurchase != null ? lastPurchase.CreatedAt : null)) + .ToListPageModelAsync(Page.GetValueOrDefault(), cancellationToken: HttpContextAccessor.HttpContext!.RequestAborted); + + if (items.Page != Page) + { + Navigation.NavigateTo(Navigation.GetUriWithQueryParameter("page", items.Page)); + } + } +} diff --git a/Groceries/Program.cs b/Groceries/Program.cs index 5b11306..85b6d53 100644 --- a/Groceries/Program.cs +++ b/Groceries/Program.cs @@ -1,9 +1,7 @@ using DbUp; -using Groceries.Common; using Groceries.Data; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.HttpOverrides; -using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.EntityFrameworkCore; @@ -59,8 +57,6 @@ builder.Services.AddDistributedMemoryCache(); builder.Services.AddHttpContextAccessor(); builder.Services.AddSession(); -builder.Services.AddSingleton, TurboStreamResultExecutor>(); - builder.Services.AddDbContextPool(options => options .EnableDetailedErrors(env.IsDevelopment()) .EnableSensitiveDataLogging(env.IsDevelopment()) diff --git a/Groceries/Stores/StoresController.cs b/Groceries/Stores/StoresController.cs index 8be27b9..109c4be 100644 --- a/Groceries/Stores/StoresController.cs +++ b/Groceries/Stores/StoresController.cs @@ -1,6 +1,5 @@ namespace Groceries.Stores; -using Groceries.Common; using Groceries.Data; using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; diff --git a/Groceries/Transactions/TransactionsController.cs b/Groceries/Transactions/TransactionsController.cs index 2521e43..6ee4806 100644 --- a/Groceries/Transactions/TransactionsController.cs +++ b/Groceries/Transactions/TransactionsController.cs @@ -1,6 +1,5 @@ namespace Groceries.Transactions; -using Groceries.Common; using Groceries.Data; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore;