lucretia/Ngino
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fixes "member" wording to "client"
Build & Deploy / build (push) Successful in 2m43s
Details

Browse Source
This commit is contained in:
lucretia
2026-07-17 21:02:18 +02:00
parent a787c54217
commit e3a538a1fb
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReverseLlama.Server/AdminEndpoints.cs
+8 -8
View File
@@ -225,7 +225,7 @@ internal static class AdminEndpoints
? Results.NoContent()
: Results.NotFound(new { error = $"Group '{id}' was not found." }));
api.MapGet("/groups/{id}/members", (string id, ManagementStore store) =>
api.MapGet("/groups/{id}/clients", (string id, ManagementStore store) =>
{
var group = store.GetGroup(id);
if (group is null)
@@ -233,10 +233,10 @@ internal static class AdminEndpoints
return Results.NotFound(new { error = $"Group '{id}' was not found." });
}
return Results.Json(store.ListGroupMembers(id));
return Results.Json(store.ListGroupClients(id));
});
api.MapPost("/groups/{id}/members", (string id, AddGroupMemberRequest request, ManagementStore store) =>
api.MapPost("/groups/{id}/clients", (string id, AddGroupClientRequest request, ManagementStore store) =>
{
var group = store.GetGroup(id);
if (group is null)
@@ -246,7 +246,7 @@ internal static class AdminEndpoints
try
{
var member = store.AddGroupMember(id, request.ClientId, request.Model, request.ClientPattern);
var member = store.AddGroupClient(id, request.ClientId, request.Model, request.ClientPattern);
return Results.Json(member);
}
catch (ArgumentException exception)
@@ -259,7 +259,7 @@ internal static class AdminEndpoints
}
});
api.MapDelete("/groups/{groupId}/members/{memberId:long}", (string groupId, long memberId, ManagementStore store) =>
api.MapDelete("/groups/{groupId}/clients/{clientId:long}", (string groupId, long clientId, ManagementStore store) =>
{
var group = store.GetGroup(groupId);
if (group is null)
@@ -267,9 +267,9 @@ internal static class AdminEndpoints
return Results.NotFound(new { error = $"Group '{groupId}' was not found." });
}
return store.RemoveGroupMember(memberId)
return store.RemoveGroupClient(clientId)
? Results.NoContent()
: Results.NotFound(new { error = $"Member '{memberId}' was not found." });
: Results.NotFound(new { error = $"Client '{clientId}' was not found." });
});
api.MapGet("/api-keys/groups", (ManagementStore store) =>
@@ -587,7 +587,7 @@ internal sealed record CreateGroupRequest(string? Name);
internal sealed record UpdateGroupRequest(string Name);
internal sealed record AddGroupMemberRequest(
internal sealed record AddGroupClientRequest(
string? ClientId,
string? Model,
string? ClientPattern);
src/ReverseLlama.Server/ManagementStore.cs
+7 -7
View File
@@ -634,7 +634,7 @@ internal sealed class ManagementStore
}
}
public IReadOnlyList<GroupMemberInfo> ListGroupMembers(string groupId)
public IReadOnlyList<GroupClientInfo> ListGroupClients(string groupId)
{
if (!_isAvailable || string.IsNullOrWhiteSpace(groupId))
{
@@ -653,11 +653,11 @@ internal sealed class ManagementStore
""";
command.Parameters.AddWithValue("$group_id", groupId);
var result = new List<GroupMemberInfo>();
var result = new List<GroupClientInfo>();
using var reader = command.ExecuteReader();
while (reader.Read())
{
result.Add(new GroupMemberInfo(
result.Add(new GroupClientInfo(
reader.GetInt64(0),
reader.GetString(1),
reader.IsDBNull(2) ? null : reader.GetString(2),
@@ -669,7 +669,7 @@ internal sealed class ManagementStore
}
}
public GroupMemberInfo AddGroupMember(string groupId, string? clientId, string? model, string? clientPattern)
public GroupClientInfo AddGroupClient(string groupId, string? clientId, string? model, string? clientPattern)
{
EnsureAvailable();
@@ -712,11 +712,11 @@ internal sealed class ManagementStore
using var idCommand = connection.CreateCommand();
idCommand.CommandText = "SELECT last_insert_rowid()";
var insertedId = (long)idCommand.ExecuteScalar()!;
return new GroupMemberInfo(insertedId, groupId, clientId, model, clientPattern);
return new GroupClientInfo(insertedId, groupId, clientId, model, clientPattern);
}
}
public bool RemoveGroupMember(long memberId)
public bool RemoveGroupClient(long memberId)
{
if (!_isAvailable)
{
@@ -1257,7 +1257,7 @@ internal sealed record GroupInfo(
DateTimeOffset CreatedAtUtc,
DateTimeOffset UpdatedAtUtc);
internal sealed record GroupMemberInfo(
internal sealed record GroupClientInfo(
long Id,
string GroupId,
string? ClientId,
src/ReverseLlama.Server/wwwroot/admin/app.js
+32 -32
View File
@@ -70,7 +70,7 @@ content.addEventListener("click", async (event) => {
}
if (action === "delete-group") {
if (!confirm("Delete this group and all its members and key assignments?")) {
if (!confirm("Delete this group and all its clients and key assignments?")) {
return;
}
@@ -80,13 +80,13 @@ content.addEventListener("click", async (event) => {
await refresh();
}
if (action === "remove-member") {
if (!confirm("Remove this member from the group?")) {
if (action === "remove-client") {
if (!confirm("Remove this client from the group?")) {
return;
}
await api(`/groups/${encodeURIComponent(groupId)}/members/${memberId}`, { method: "DELETE" });
setNotice("Member removed.");
await api(`/groups/${encodeURIComponent(groupId)}/clients/${memberId}`, { method: "DELETE" });
setNotice("Client removed.");
await loadGroupDetail(groupId);
}
@@ -153,7 +153,7 @@ content.addEventListener("submit", async (event) => {
await loadGroupDetail(groupId);
}
if (form.dataset.form === "add-member") {
if (form.dataset.form === "add-client") {
const groupId = form.dataset.groupId;
const body = {};
if (data.clientId && data.clientId.trim()) {
@@ -170,11 +170,11 @@ content.addEventListener("submit", async (event) => {
throw new Error("Either Client ID or Client pattern is required.");
}
await api(`/groups/${encodeURIComponent(groupId)}/members`, {
await api(`/groups/${encodeURIComponent(groupId)}/clients`, {
method: "POST",
body
});
setNotice("Member added.");
setNotice("Client added.");
form.reset();
await loadGroupDetail(groupId);
}
@@ -731,13 +731,13 @@ async function loadGroupDetail(groupId) {
content.innerHTML = `<div class="panel"><div class="empty">Loading group...</div></div>`;
try {
const [group, members, apiKeyGroups] = await Promise.all([
const [group, clients, apiKeyGroups] = await Promise.all([
api(`/groups/${encodeURIComponent(groupId)}`),
api(`/groups/${encodeURIComponent(groupId)}/members`),
api(`/groups/${encodeURIComponent(groupId)}/clients`),
api("/api-keys/groups")
]);
state.groupDetail = { group, members, apiKeyGroups };
state.groupDetail = { group, clients, apiKeyGroups };
renderGroupDetail();
} catch (error) {
content.innerHTML = `<div class="panel"><div class="empty">${escapeHtml(error.message)}</div></div>`;
@@ -745,7 +745,7 @@ async function loadGroupDetail(groupId) {
}
function renderGroupDetail() {
const { group, members, apiKeyGroups } = state.groupDetail;
const { group, clients, apiKeyGroups } = state.groupDetail;
const allApiKeys = state.summary?.apiKeys || [];
const assignedKeyIds = new Set(
apiKeyGroups
@@ -776,21 +776,21 @@ function renderGroupDetail() {
</div>
<div class="panel">
<div class="panel-header">
<h2>Add member</h2>
<h2>Add client</h2>
</div>
<div class="panel-body">
<form class="form-row" data-form="add-member" data-group-id="${escapeAttr(group.id)}">
<form class="form-row" data-form="add-client" data-group-id="${escapeAttr(group.id)}">
<div class="field">
<label for="addMemberClient">Client ID</label>
<input class="input" id="addMemberClient" name="clientId" placeholder="Client_1">
<label for="addClientClientId">Client ID</label>
<input class="input" id="addClientClientId" name="clientId" placeholder="Client_1">
</div>
<div class="field">
<label for="addMemberModel">Model (optional)</label>
<input class="input" id="addMemberModel" name="model" placeholder="bge-m3">
<label for="addClientModel">Model (optional)</label>
<input class="input" id="addClientModel" name="model" placeholder="bge-m3">
</div>
<div class="field">
<label for="addMemberPattern">Client pattern (regex, optional)</label>
<input class="input" id="addMemberPattern" name="clientPattern" placeholder="GPU_[0-9]*">
<label for="addClientPattern">Client pattern (regex, optional)</label>
<input class="input" id="addClientPattern" name="clientPattern" placeholder="GPU_[0-9]*">
</div>
<button class="button" type="submit">Add</button>
</form>
@@ -799,11 +799,11 @@ function renderGroupDetail() {
</div>
<div class="panel">
<div class="panel-header">
<h2>Members</h2>
<span class="badge">${members.length} total</span>
<h2>Clients</h2>
<span class="badge">${clients.length} total</span>
</div>
<div class="table-wrap">
${members.length ? groupMembersTable(members, group.id) : emptyState("No members in this group.")}
${clients.length ? groupClientsTable(clients, group.id) : emptyState("No clients in this group.")}
</div>
</div>
<div class="panel">
@@ -817,29 +817,29 @@ function renderGroupDetail() {
`;
}
function groupMembersTable(members, groupId) {
const rows = members.map((member) => `
function groupClientsTable(clients, groupId) {
const rows = clients.map((client) => `
<tr>
<td>
${member.clientId
? `<div class="cell-main">${escapeHtml(member.clientId)}</div>`
${client.clientId
? `<div class="cell-main">${escapeHtml(client.clientId)}</div>`
: `<div class="cell-sub">-</div>`
}
</td>
<td>
${member.model
? `<div class="cell-main">${escapeHtml(member.model)}</div>`
${client.model
? `<div class="cell-main">${escapeHtml(client.model)}</div>`
: `<div class="cell-sub">All models</div>`
}
</td>
<td>
${member.clientPattern
? `<div class="cell-main code-inline">${escapeHtml(member.clientPattern)}</div>`
${client.clientPattern
? `<div class="cell-main code-inline">${escapeHtml(client.clientPattern)}</div>`
: `<div class="cell-sub">-</div>`
}
</td>
<td>
<button class="button danger" data-action="remove-member" data-group-id="${escapeAttr(groupId)}" data-member-id="${member.id}">Remove</button>
<button class="button danger" data-action="remove-client" data-group-id="${escapeAttr(groupId)}" data-member-id="${client.id}">Remove</button>
</td>
</tr>
`).join("");