diff --git a/Moonlight/App/Services/Ticketing/TicketChatService.cs b/Moonlight/App/Services/Ticketing/TicketChatService.cs index 7e8318f..e868f30 100644 --- a/Moonlight/App/Services/Ticketing/TicketChatService.cs +++ b/Moonlight/App/Services/Ticketing/TicketChatService.cs @@ -1,5 +1,6 @@ using Microsoft.EntityFrameworkCore; using Moonlight.App.Database.Entities.Tickets; +using Moonlight.App.Database.Enums; using Moonlight.App.Event; using Moonlight.App.Event.Args; using Moonlight.App.Extensions; @@ -50,7 +51,31 @@ public class TicketChatService return Task.CompletedTask; } - public Task Stop() + public async Task Update(bool open, TicketPriority priority) // Updated and syncs ticket states to all listeners + { + if (Ticket.Open != open) + { + Ticket.Open = open; + + if(open) + await SendSystemMessage("Ticket has been opened"); + else + await SendSystemMessage("Ticket has been closed"); + } + + if (Ticket.Priority != priority) + { + Ticket.Priority = priority; + + await SendSystemMessage($"Ticket priority to {priority}"); + } + + TicketRepository.Update(Ticket); + + await Events.OnTicketUpdated.InvokeAsync(Ticket); + } + + public Task Stop() // Clear cache and stop listeners { Events.OnTicketMessage -= OnTicketMessage; Events.OnTicketUpdated -= OnTicketUpdated; @@ -60,7 +85,24 @@ public class TicketChatService return Task.CompletedTask; } - public async Task SendMessage(string content, Stream? attachmentStream = null, string? attachmentName = null) + #region Sending + + public async Task SendSystemMessage(string content) // use this to send a message shown in a seperator + { + // Build the message model + var message = new TicketMessage() + { + Content = content, + Attachment = null, + CreatedAt = DateTime.UtcNow, + Sender = null, + IsSupport = IsSupporter + }; + + await SyncMessage(message); + } + + public async Task SendMessage(string content, Stream? attachmentStream = null, string? attachmentName = null) // Regular send method { if(string.IsNullOrEmpty(content)) return; @@ -87,6 +129,11 @@ public class TicketChatService IsSupport = IsSupporter }; + await SyncMessage(message); + } + + private async Task SyncMessage(TicketMessage message) // Use this function to save and sync function to others + { // Save ticket to the db var t = TicketRepository .Get() @@ -103,6 +150,8 @@ public class TicketChatService }); } + #endregion + // Event handlers private async void OnTicketUpdated(object? _, Ticket ticket) { diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index e6aec37..d79b7ef 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -47,6 +47,17 @@ <_ContentIncludedByDefault Remove="storage\config.json" /> + <_ContentIncludedByDefault Remove="Shared\Components\Partials\TicketPopup\LiveChatCreate.razor" /> + <_ContentIncludedByDefault Remove="Shared\Components\Partials\TicketPopup\LiveChatMain.razor" /> + <_ContentIncludedByDefault Remove="Shared\Components\Partials\TicketPopup\LiveChatOverview.razor" /> + <_ContentIncludedByDefault Remove="Shared\Components\Partials\TicketPopup\LiveChatView.razor" /> + + + + + + + diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 4f00ccd..025f3dc 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -23,6 +23,7 @@ Directory.CreateDirectory(PathBuilder.Dir("storage", "logs")); var logConfig = new LoggerConfiguration(); logConfig = logConfig.Enrich.FromLogContext() + .MinimumLevel.Debug() .WriteTo.Console( outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}"); diff --git a/Moonlight/Shared/Components/Partials/Sidebar.razor b/Moonlight/Shared/Components/Partials/Sidebar.razor index c6e0202..eaec431 100644 --- a/Moonlight/Shared/Components/Partials/Sidebar.razor +++ b/Moonlight/Shared/Components/Partials/Sidebar.razor @@ -106,6 +106,17 @@ +
+ + + + + + Tickets + + +
+
diff --git a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatCreate.razor b/Moonlight/Shared/Components/TicketPopup/TicketPopupCreate.razor similarity index 92% rename from Moonlight/Shared/Components/Partials/LiveChat/LiveChatCreate.razor rename to Moonlight/Shared/Components/TicketPopup/TicketPopupCreate.razor index f2d9306..0746327 100644 --- a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatCreate.razor +++ b/Moonlight/Shared/Components/TicketPopup/TicketPopupCreate.razor @@ -11,7 +11,7 @@
Create a new ticket
-
@@ -49,7 +49,7 @@ @code { [CascadingParameter] - public LiveChatMain LiveChatMain { get; set; } + public TicketPopupMain TicketPopupMain { get; set; } private Service[] Services; private CreateTicketForm Form = new(); @@ -77,6 +77,6 @@ Form.Service ); - await LiveChatMain.OpenTicket(ticket); + await TicketPopupMain.OpenTicket(ticket); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatMain.razor b/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor similarity index 90% rename from Moonlight/Shared/Components/Partials/LiveChat/LiveChatMain.razor rename to Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor index 70e6781..f441169 100644 --- a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatMain.razor +++ b/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor @@ -12,15 +12,15 @@
@if (ViewIndex == 1) { - + } else if (ViewIndex == 2) { - + } else if (ViewIndex == 3) { - + }
} diff --git a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatOverview.razor b/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor similarity index 84% rename from Moonlight/Shared/Components/Partials/LiveChat/LiveChatOverview.razor rename to Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor index 8fa59c4..98b16c1 100644 --- a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatOverview.razor +++ b/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor @@ -11,7 +11,7 @@
Your tickets
-
@@ -19,7 +19,7 @@
-

Need help? Create a ticket

+

Need help? Create a ticket

@@ -30,7 +30,7 @@ { foreach (var ticket in Tickets) { - +
@(ticket.Name) @@ -54,7 +54,7 @@ @code { [CascadingParameter] - public LiveChatMain LiveChatMain { get; set; } + public TicketPopupMain TicketPopupMain { get; set; } private Ticket[] Tickets; diff --git a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatView.razor b/Moonlight/Shared/Components/TicketPopup/TicketPopupView.razor similarity index 86% rename from Moonlight/Shared/Components/Partials/LiveChat/LiveChatView.razor rename to Moonlight/Shared/Components/TicketPopup/TicketPopupView.razor index 2599546..f970dca 100644 --- a/Moonlight/Shared/Components/Partials/LiveChat/LiveChatView.razor +++ b/Moonlight/Shared/Components/TicketPopup/TicketPopupView.razor @@ -8,7 +8,7 @@
@(HasStarted ? TicketService.Chat.Ticket.Name : "Loading")
-
@@ -66,7 +66,7 @@
- + @@ -78,12 +78,12 @@ @code { [CascadingParameter] - public LiveChatMain LiveChatMain { get; set; } - - private ChatFileSelect FileSelect; + public TicketPopupMain TicketPopupMain { get; set; } private bool HasStarted = false; - private string MyMessageContent = ""; + + private ChatFileSelect FileSelect; + private string MessageContent = ""; private async Task Load(LazyLoader lazyLoader) { @@ -91,7 +91,7 @@ // Initialize chat service and start it TicketService.Chat.OnUpdate = OnUpdate; - await TicketService.Chat.Start(LiveChatMain.CurrentTicket); + await TicketService.Chat.Start(TicketPopupMain.CurrentTicket); // Let the ui know that we are ready HasStarted = true; @@ -105,18 +105,18 @@ private async Task SendMessage() { - if (string.IsNullOrEmpty(MyMessageContent) && FileSelect.SelectedFile == null) + if (string.IsNullOrEmpty(MessageContent) && FileSelect.SelectedFile == null) return; if (!HasStarted) return; if (FileSelect.SelectedFile == null) - await TicketService.Chat.SendMessage(MyMessageContent); + await TicketService.Chat.SendMessage(MessageContent); else { await TicketService.Chat.SendMessage( - string.IsNullOrEmpty(MyMessageContent) ? $"Upload of {FileSelect.SelectedFile.Name}" : MyMessageContent, + string.IsNullOrEmpty(MessageContent) ? $"Upload of {FileSelect.SelectedFile.Name}" : MessageContent, FileSelect.SelectedFile.OpenReadStream(1024 * 1024 * 5), FileSelect.SelectedFile.Name ); @@ -124,7 +124,7 @@ await FileSelect.RemoveSelection(); } - MyMessageContent = ""; + MessageContent = ""; await InvokeAsync(StateHasChanged); } diff --git a/Moonlight/Shared/Layouts/DefaultLayout.razor b/Moonlight/Shared/Layouts/DefaultLayout.razor index 025226b..2c751a9 100644 --- a/Moonlight/Shared/Layouts/DefaultLayout.razor +++ b/Moonlight/Shared/Layouts/DefaultLayout.razor @@ -1,4 +1,4 @@ -@using Moonlight.Shared.Components.Partials.LiveChat +@using Moonlight.Shared.Components.TicketPopup
@@ -11,7 +11,7 @@
@ChildContent - +
diff --git a/Moonlight/Shared/Views/Admin/Tickets/Index.razor b/Moonlight/Shared/Views/Admin/Tickets/Index.razor new file mode 100644 index 0000000..d83d7a4 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Tickets/Index.razor @@ -0,0 +1,265 @@ +@page "/admin/tickets" + +@using Moonlight.App.Extensions.Attributes +@using Moonlight.App.Models.Enums +@using Moonlight.App.Repositories +@using Moonlight.App.Database.Entities.Tickets +@using BlazorTable +@using Microsoft.EntityFrameworkCore +@using Moonlight.App.Database.Enums +@using Moonlight.App.Event +@using Moonlight.App.Event.Args + +@attribute [RequirePermission(Permission.AdminTickets)] + +@implements IDisposable + +@inject Repository TicketRepository + +
+ +
+
+
+
+
+
+ Total Tickets +
+ + @(TotalTicketsCount) + +
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+ Pending tickets +
+ + @(PendingTicketsCount) + +
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+ Closed tickets +
+ + @(ClosedTicketsCount) + +
+
+ + + +
+
+
+
+
+ +
+ +
+
+ + Ticket overview + +
+
+ + +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + +
+
+ +
+
+ +@code +{ + // Lazy loaders + private LazyLoader TicketLazyLoader; + private LazyLoader StatisticsLazyLoader; + + // Statistics + private int TotalTicketsCount; + private int ClosedTicketsCount; + private int PendingTicketsCount; + + // Data + private int Filter = 0; + private Ticket[] AllTickets; + + protected override void OnInitialized() + { + Events.OnTicketCreated += OnTicketCreated; + Events.OnTicketUpdated += OnTicketUpdated; + Events.OnTicketMessage += OnTicketMessage; + } + + #region Lazyloaders + + private Task LoadStatistics(LazyLoader lazyLoader) + { + TotalTicketsCount = TicketRepository + .Get() + .Count(); + + ClosedTicketsCount = TicketRepository + .Get() + .Count(x => !x.Open); + + PendingTicketsCount = TicketRepository + .Get() + .Where(x => x.Open) + .Count(x => x.Messages.All(x => !x.IsSupport)); + + return Task.CompletedTask; + } + + private Task LoadTickets(LazyLoader lazyLoader) + { + if (Filter == 0) + { + AllTickets = TicketRepository + .Get() + .Include(x => x.Creator) + .Include(x => x.Service) + .ThenInclude(x => x.Product) + .Where(x => x.Open) + .ToArray(); + } + else if (Filter == 1) + { + AllTickets = TicketRepository + .Get() + .Include(x => x.Creator) + .Include(x => x.Service) + .ThenInclude(x => x.Product) + .Where(x => !x.Open) + .ToArray(); + } + + return Task.CompletedTask; + } + + #endregion + + private async Task UpdateFilter(int filter) + { + Filter = filter; + + await TicketLazyLoader.Reload(); + } + + #region Events + + private async void OnTicketMessage(object? sender, TicketMessageEventArgs message) + { + if(!message.TicketMessage.IsSupport) // Only update if support has sent messages as the pending tickets depend on that + return; + + await StatisticsLazyLoader.Reload(); + await TicketLazyLoader.Reload(); + } + + private async void OnTicketUpdated(object? o, Ticket e) + { + await StatisticsLazyLoader.Reload(); + await TicketLazyLoader.Reload(); + } + + private async void OnTicketCreated(object? o, Ticket e) + { + await StatisticsLazyLoader.Reload(); + await TicketLazyLoader.Reload(); + } + + #endregion + + public void Dispose() // Unsubscribe to events + { + Events.OnTicketCreated -= OnTicketCreated; + Events.OnTicketUpdated -= OnTicketUpdated; + Events.OnTicketMessage -= OnTicketMessage; + } +} diff --git a/Moonlight/Shared/Views/Admin/Tickets/View.razor b/Moonlight/Shared/Views/Admin/Tickets/View.razor new file mode 100644 index 0000000..3b30517 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Tickets/View.razor @@ -0,0 +1,272 @@ +@page "/admin/tickets/view/{Id:int}" + +@using Moonlight.App.Extensions.Attributes +@using Moonlight.App.Models.Enums +@using Moonlight.App.Repositories +@using Moonlight.App.Services.Ticketing +@using Moonlight.App.Database.Entities.Tickets +@using System.Text.RegularExpressions +@using Microsoft.EntityFrameworkCore +@using Moonlight.App.Database.Enums + +@attribute [RequirePermission(Permission.AdminTickets)] + +@implements IDisposable + +@inject TicketService TicketService +@inject ToastService ToastService +@inject Repository TicketRepository + + + @if (Ticket == null) + { + + } + else + { +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Ticket ID + @(Ticket.Id)
+ User + + @(Ticket.Creator.Username) +
+ Service + + @if (Ticket.Service == null) + { + None + } + else + { + @(Ticket.Service.Nickname ?? $"Service {Ticket.Service.Id}") + } +
+ Status + +
+ +
+
+ Priority + + +
+ Created at + + @(Formatter.FormatDate(Ticket.CreatedAt)) +
+ +
+
+
+
+
+
+
+
+ +
+ @foreach (var message in TicketService.Chat.Messages.OrderByDescending(x => x.CreatedAt)) + { + var orientation = message.IsSupport ? "end" : "start"; + + if (message.Sender != null) + { +
+
+
+
+ Avatar +
+
+
@(message.Sender.Username)
+ @(Formatter.FormatAgoFromDateTime(message.CreatedAt)) +
+
+
+ @(Formatter.FormatLineBreaks(message.Content)) + + @if (message.Attachment != null) + { +
+ @if (Regex.IsMatch(message.Attachment, @"\.(jpg|jpeg|png|gif|bmp)$")) + { + Attachment + } + else + { + + @(message.Attachment) + + } +
+ } +
+
+
+ } + else + { +
@(message.Content)
+ } + } +
+ +
+
+
+
+ + + + + +
+
+
+
+
+
+ } + + +@code +{ + [Parameter] + public int Id { get; set; } + + private Ticket? Ticket; + private bool HasStarted = false; + + // Message compose cache + private ChatFileSelect FileSelect; + private string MessageContent = ""; + + // Edit cache + private bool EditOpen; + private TicketPriority EditPriority; + + private Task LoadTicket(LazyLoader _) + { + Ticket = TicketRepository + .Get() + .Include(x => x.Creator) + .Include(x => x.Service) + .FirstOrDefault(x => x.Id == Id); + + return Task.CompletedTask; + } + + private async Task LoadChatClient(LazyLoader lazyLoader) + { + if (Ticket != null) + { + await lazyLoader.SetText("Starting chat client"); + + TicketService.Chat.OnUpdate += OnUpdate; + await TicketService.Chat.Start(Ticket, true); + + EditOpen = TicketService.Chat.Ticket.Open; + EditPriority = TicketService.Chat.Ticket.Priority; + + HasStarted = true; + await InvokeAsync(StateHasChanged); + } + } + + private async Task SendMessage() + { + if (string.IsNullOrEmpty(MessageContent) && FileSelect.SelectedFile == null) + return; + + if (!HasStarted) + return; + + if (FileSelect.SelectedFile == null) + await TicketService.Chat.SendMessage(MessageContent); + else + { + await TicketService.Chat.SendMessage( + string.IsNullOrEmpty(MessageContent) ? $"Upload of {FileSelect.SelectedFile.Name}" : MessageContent, + FileSelect.SelectedFile.OpenReadStream(1024 * 1024 * 5), + FileSelect.SelectedFile.Name + ); + + await FileSelect.RemoveSelection(); + } + + MessageContent = ""; + await InvokeAsync(StateHasChanged); + } + + private async Task Save() + { + await TicketService.Chat.Update(EditOpen, EditPriority); + await ToastService.Success("Successfully updated ticket"); + } + + private async Task OnUpdate() + { + // Overwrite current cached data + EditOpen = TicketService.Chat.Ticket.Open; + EditPriority = TicketService.Chat.Ticket.Priority; + + await InvokeAsync(StateHasChanged); + } + + public async void Dispose() + { + await TicketService.Chat.Stop(); + } +} \ No newline at end of file