Added multiple qol imporvements
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using HopFrame.Core.Config;
|
||||
using HopFrame.Web.Components.Pages;
|
||||
using HopFrame.Web.Plugins.Events;
|
||||
using Microsoft.AspNetCore.Components;
|
||||
using Microsoft.FluentUI.AspNetCore.Components;
|
||||
@@ -6,10 +7,12 @@ using SpotiParty.Web.Models;
|
||||
|
||||
namespace SpotiParty.Web.Services;
|
||||
|
||||
public class AdminDashboardPlugin(NavigationManager navigator) {
|
||||
public class AdminDashboardPlugin(NavigationManager navigator, DashboardAuthHandler auth, EventsDashboardRepo repo) {
|
||||
|
||||
private HopFrameTablePage _page;
|
||||
|
||||
[HopFrame.Web.Plugins.Annotations.EventHandler]
|
||||
public void OnTableInitialized(TableInitializedEvent e) {
|
||||
public async Task OnTableInitialized(TableInitializedEvent e) {
|
||||
if (e.Table.TableType != typeof(Event)) return;
|
||||
|
||||
e.AddEntityButton(new IconInfo {
|
||||
@@ -17,11 +20,27 @@ public class AdminDashboardPlugin(NavigationManager navigator) {
|
||||
Size = IconSize.Size16,
|
||||
Name = "Open"
|
||||
}, OnButtonClicked);
|
||||
|
||||
var user = await auth.GetCurrentUser();
|
||||
|
||||
if (user is not null && user.IsAdmin) {
|
||||
e.AddPageButton("Show all", ToggleAllEvents);
|
||||
}
|
||||
|
||||
_page = e.Sender;
|
||||
}
|
||||
|
||||
private void OnButtonClicked(object o, TableConfig config) {
|
||||
var entity = (Event)o;
|
||||
navigator.NavigateTo(navigator.BaseUri + $"enqueue/{entity.Id}");
|
||||
}
|
||||
|
||||
private async Task ToggleAllEvents() {
|
||||
if (repo.ShowAllEvents)
|
||||
return;
|
||||
|
||||
repo.ShowAllEvents = true;
|
||||
await _page.Reload();
|
||||
}
|
||||
|
||||
}
|
||||
27
SpotiParty.Web/Services/CleanupService.cs
Normal file
27
SpotiParty.Web/Services/CleanupService.cs
Normal file
@@ -0,0 +1,27 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace SpotiParty.Web.Services;
|
||||
|
||||
public class CleanupService(IServiceProvider services, ILogger<CleanupService> logger) : BackgroundService {
|
||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken) {
|
||||
while (!stoppingToken.IsCancellationRequested) {
|
||||
await using (var scope = services.CreateAsyncScope()) {
|
||||
var context = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
|
||||
|
||||
var now = DateTime.Now;
|
||||
var oldEvents = await context.Events
|
||||
.Where(e => e.End < now)
|
||||
.ToArrayAsync(stoppingToken);
|
||||
|
||||
context.Events.RemoveRange(oldEvents);
|
||||
await context.SaveChangesAsync(stoppingToken);
|
||||
|
||||
if (oldEvents.Length > 0)
|
||||
logger.LogInformation("Deleted {count} old events", oldEvents.Length);
|
||||
}
|
||||
|
||||
var nextRun = DateTime.Today.AddDays(1).AddHours(3) - DateTime.Now;
|
||||
await Task.Delay(nextRun, stoppingToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,22 +6,48 @@ namespace SpotiParty.Web.Services;
|
||||
|
||||
public class EventsDashboardRepo(DatabaseContext context, DashboardAuthHandler handler, IDbContextFactory<DatabaseContext> factory) : IHopFrameRepository<Event, Guid> {
|
||||
|
||||
public bool ShowAllEvents { get; set; } = false;
|
||||
|
||||
public async Task<IEnumerable<Event>> LoadPage(int page, int perPage) {
|
||||
var user = await handler.GetCurrentUser();
|
||||
if (user is null) return [];
|
||||
|
||||
return await context.Events
|
||||
IQueryable<Event> baseQuery = context.Events
|
||||
.Include(e => e.Host)
|
||||
.OrderBy(e => e.Id)
|
||||
.Where(e => e.Host.UserId == user.UserId)
|
||||
.OrderBy(e => e.Id);
|
||||
|
||||
if (!ShowAllEvents) {
|
||||
baseQuery = baseQuery.Where(e => e.Host.UserId == user.UserId);
|
||||
}
|
||||
|
||||
return await baseQuery
|
||||
.Skip(page * perPage)
|
||||
.Take(perPage)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<SearchResult<Event>> Search(string searchTerm, int page, int perPage) {
|
||||
var entries = await LoadPage(page, perPage);
|
||||
return new(entries, await GetTotalPageCount(perPage));
|
||||
var user = await handler.GetCurrentUser();
|
||||
if (user is null) return new(Enumerable.Empty<Event>(), 0);
|
||||
|
||||
IQueryable<Event> baseQuery = context.Events
|
||||
.Include(e => e.Host)
|
||||
.OrderBy(e => e.Id);
|
||||
|
||||
if (!ShowAllEvents) {
|
||||
baseQuery = baseQuery.Where(e => e.Host.UserId == user.UserId);
|
||||
}
|
||||
|
||||
baseQuery = baseQuery
|
||||
.Where(e => e.Name.ToLower().Contains(searchTerm.ToLower()));
|
||||
|
||||
var totalEntries = await baseQuery.CountAsync();
|
||||
var entries = await baseQuery
|
||||
.Skip(page * perPage)
|
||||
.Take(perPage)
|
||||
.ToListAsync();
|
||||
|
||||
return new(entries, (int)Math.Ceiling(totalEntries / (double)perPage));
|
||||
}
|
||||
|
||||
public async Task<int> GetTotalPageCount(int perPage) {
|
||||
|
||||
Reference in New Issue
Block a user