notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/razor] Refactor queue dashboard job view to better accommodate different job data formats

Browse source
This commit is contained in:
Laura Hausmann 2024-06-21 20:26:30 +02:00
parent 2e536bcd47
commit 9ac2284dd5
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 41 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Iceshrimp.Backend/Core/Extensions/StringExtensions.cs
View file

@ -26,6 +26,13 @@ public static class StringExtensions
{
return new IdnMapping().GetUnicode(target);
}
public static string ToTitleCase(this string input) => input switch
{
null => throw new ArgumentNullException(nameof(input)),
"" => throw new ArgumentException(@$"{nameof(input)} cannot be empty", nameof(input)),
_ => string.Concat(input[0].ToString().ToUpper(), input.AsSpan(1))
};
}
[SuppressMessage("ReSharper", "StringCompareToIsCultureSpecific")]

111
Iceshrimp.Backend/Pages/QueueJob.cshtml
View file

@ -1,8 +1,9 @@
@page "/queue/job/{id::guid:required}"
@using System.Text.Json
@using System.Text.Json.Nodes
@using System.Text.Json.Serialization
@using Iceshrimp.Backend.Core.Database.Tables
@using Iceshrimp.Backend.Core.Extensions
@using Iceshrimp.Backend.Core.Queues
@model QueueJobModel
@{
@ -117,98 +118,34 @@
<h3>Job data</h3>
@{
if (Model.Job.Queue == "inbox")
var dataOpts = new JsonSerializerOptions { WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull };
var payloadOpts = new JsonSerializerOptions { WriteIndented = true };
if (Model.Lookup.TryGetValue(Model.Job.Queue, out var payloadKey))
{
var data = JsonSerializer.Deserialize<InboxJobData>(Model.Job.Data) ??
throw new Exception("Failed to deserialize inbox job data");
var data = JsonNode.Parse(Model.Job.Data)?.AsObject() ??
throw new Exception($"Failed to deserialize {Model.Job.Queue} job data");
var payloadElem = data[payloadKey];
var payload = payloadElem?.GetValue<string>() ??
throw new Exception($"Failed to deserialize {Model.Job.Queue} job data");
var payloadJson = JsonNode.Parse(payload)?.ToJsonString(payloadOpts) ??
throw new Exception($"Failed to serialize {Model.Job.Queue} job data");
@if (data.InboxUserId != null || data.AuthenticatedUserId != null)
{
<table>
<tbody>
@if (data.InboxUserId != null)
{
<tr>
<td>Inbox user id</td>
<td>@data.InboxUserId</td>
</tr>
}
@if (data.AuthenticatedUserId != null)
{
<tr>
<td>Authenticated user id</td>
<td>@data.AuthenticatedUserId</td>
</tr>
}
</tbody>
</table>
}
data.Remove(payloadKey);
foreach (var item in data.Where(p => p.Value?.GetValueKind() is null or JsonValueKind.Null).ToList())
data.Remove(item.Key);
<h3>Body</h3>
var json = JsonSerializer.Serialize(JsonDocument.Parse(data.Body), new JsonSerializerOptions { WriteIndented = true });
<pre><code id="data">@json</code></pre>
}
else if (Model.Job.Queue == "deliver")
{
var data = JsonSerializer.Deserialize<DeliverJobData>(Model.Job.Data) ??
throw new Exception("Failed to deserialize deliver job data");
<table>
<tbody>
<tr>
<td>Inbox URL</td>
<td>@data.InboxUrl</td>
</tr>
<tr>
<td>Content type</td>
<td>@data.ContentType</td>
</tr>
<tr>
<td>User ID</td>
<td>@data.UserId</td>
</tr>
<tr>
<td>Recipient host</td>
<td>@data.RecipientHost</td>
</tr>
</tbody>
</table>
<h3>Payload</h3>
var json = JsonSerializer.Serialize(JsonDocument.Parse(data.Payload), new JsonSerializerOptions { WriteIndented = true });
<pre><code id="data">@json</code></pre>
}
else if (Model.Job.Queue == "pre-deliver")
{
var data = JsonSerializer.Deserialize<PreDeliverJobData>(Model.Job.Data) ??
throw new Exception("Failed to deserialize pre-deliver job data");
<table>
<tbody>
<tr>
<td>Actor ID</td>
<td>@data.ActorId</td>
</tr>
<tr>
<td>Recipient IDs</td>
<td>[@string.Join(", ", data.RecipientIds)]</td>
</tr>
<tr>
<td>Deliver to followers</td>
<td>@data.DeliverToFollowers</td>
</tr>
</tbody>
</table>
<h3>Serialized activity</h3>
var json = JsonSerializer.Serialize(JsonDocument.Parse(data.SerializedActivity), new JsonSerializerOptions { WriteIndented = true });
<pre><code id="data">@json</code></pre>
var dataJson = data.ToJsonString(dataOpts);
<pre><code>@dataJson</code></pre>
<h3>Job payload</h3>
<pre><code id="payload">@payloadJson</code></pre>
}
else
{
var json = JsonSerializer.Serialize(JsonDocument.Parse(Model.Job.Data), new JsonSerializerOptions { WriteIndented = true });
<pre><code id="data">@json</code></pre>
var json = JsonNode.Parse(Model.Job.Data)?.ToJsonString(payloadOpts) ??
throw new Exception($"Failed to serialize {Model.Job.Queue} job data");
<pre><code id="payload">@json</code></pre>
}
}
<button onclick="copyElementToClipboard('data');">Copy to clipboard</button>
<button onclick="copyElementToClipboard('payload');">Copy to clipboard</button>

10
Iceshrimp.Backend/Pages/QueueJob.cshtml.cs
View file

@ -1,6 +1,7 @@
using Iceshrimp.Backend.Core.Database;
using Iceshrimp.Backend.Core.Database.Tables;
using Iceshrimp.Backend.Core.Middleware;
using Iceshrimp.Backend.Core.Queues;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.EntityFrameworkCore;
@ -22,4 +23,13 @@ public class QueueJobModel(DatabaseContext db) : PageModel
throw GracefulException.NotFound($"Job {id} not found");
return Page();
}
private static Dictionary<string, string> _lookup = new()
{
{ "inbox", "body" },
{ "deliver", "payload" },
{ "pre-deliver", "serializedActivity" }
};
public Dictionary<string, string> Lookup => _lookup;
}