Merge pull request #222 from Moonlight-Panel/FixServerList
Fixed server list and server navigation
This commit is contained in:
Marcel Baumgartner
GitHub
commit
8f9508f30b
2 changed files with 92 additions and 34 deletions
|
|
@ -25,11 +25,17 @@
|
|||
</div>
|
||||
<div class="col-4 d-flex flex-column flex-end mb-1">
|
||||
<div class="btn-group btn-group-sm">
|
||||
<button class="w-100 nav-link btn btn-sm btn-success fw-bold px-4 me-1 @(Console.ServerState == ServerState.Offline ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Start"><TL>Start</TL></button>
|
||||
<button class="w-100 nav-link btn btn-sm btn-primary fw-bold px-4 me-1 @(Console.ServerState == ServerState.Running ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Restart"><TL>Restart</TL></button>
|
||||
<button class="w-100 nav-link btn btn-sm btn-success fw-bold px-4 me-1 @(Console.ServerState == ServerState.Offline ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Start">
|
||||
<TL>Start</TL>
|
||||
</button>
|
||||
<button class="w-100 nav-link btn btn-sm btn-primary fw-bold px-4 me-1 @(Console.ServerState == ServerState.Running ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Restart">
|
||||
<TL>Restart</TL>
|
||||
</button>
|
||||
@if (Console.ServerState == ServerState.Stopping)
|
||||
{
|
||||
<button class="w-100 nav-link btn btn-sm btn-danger fw-bold px-4 me-1" aria-selected="true" role="tab" @onclick="Kill"><TL>Kill</TL></button>
|
||||
<button class="w-100 nav-link btn btn-sm btn-danger fw-bold px-4 me-1" aria-selected="true" role="tab" @onclick="Kill">
|
||||
<TL>Kill</TL>
|
||||
</button>
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -47,7 +53,7 @@
|
|||
<div class="row align-items-center">
|
||||
<div class="col fs-5">
|
||||
<span class="fw-bold"><TL>Shared IP</TL>:</span>
|
||||
<span class="ms-1 text-muted @(User.StreamerMode ? "blur" : "")">@($"{CurrentServer.Node.Fqdn}:{CurrentServer.MainAllocation.Port}")</span>
|
||||
<span class="ms-1 text-muted @(User.StreamerMode ? "blur" : "")">@($"{CurrentServer.Node.Fqdn}:{CurrentServer.MainAllocation?.Port ?? 0}")</span>
|
||||
</div>
|
||||
<div class="col fs-5">
|
||||
<span class="fw-bold"><TL>Server ID</TL>:</span>
|
||||
|
|
@ -68,21 +74,29 @@
|
|||
@switch (Console.ServerState)
|
||||
{
|
||||
case ServerState.Offline:
|
||||
<span class="text-danger"><TL>Offline</TL></span>
|
||||
<span class="text-danger">
|
||||
<TL>Offline</TL>
|
||||
</span>
|
||||
break;
|
||||
|
||||
case ServerState.Starting:
|
||||
<span class="text-warning"><TL>Starting</TL></span>
|
||||
<span class="text-warning">
|
||||
<TL>Starting</TL>
|
||||
</span>
|
||||
<span class="text-gray-700 pt-1 fw-semibold">(@(Formatter.FormatUptime(Console.Resource.Uptime)))</span>
|
||||
break;
|
||||
|
||||
case ServerState.Stopping:
|
||||
<span class="text-warning"><TL>Stopping</TL></span>
|
||||
<span class="text-warning">
|
||||
<TL>Stopping</TL>
|
||||
</span>
|
||||
<span class="text-gray-700 pt-1 fw-semibold">(@(Formatter.FormatUptime(Console.Resource.Uptime)))</span>
|
||||
break;
|
||||
|
||||
case ServerState.Running:
|
||||
<span class="text-success"><TL>Online</TL></span>
|
||||
<span class="text-success">
|
||||
<TL>Online</TL>
|
||||
</span>
|
||||
<span class="text-gray-700 pt-1 fw-semibold">(@(Formatter.FormatUptime(Console.Resource.Uptime)))</span>
|
||||
break;
|
||||
}
|
||||
|
|
@ -110,7 +124,9 @@
|
|||
<a href="/server/@(CurrentServer.Uuid)/" class="nav-link w-100 btn btn-flex @(Index == 0 ? "active" : "") btn-active-light-primary">
|
||||
<i class="bx bx-terminal bx-sm me-2"></i>
|
||||
<span class="d-flex flex-column align-items-start">
|
||||
<span class="fs-5"><TL>Console</TL></span>
|
||||
<span class="fs-5">
|
||||
<TL>Console</TL>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -118,7 +134,9 @@
|
|||
<a href="/server/@(CurrentServer.Uuid)/files" class="nav-link w-100 btn btn-flex @(Index == 1 ? "active" : "") btn-active-light-primary">
|
||||
<i class="bx bx-folder bx-sm me-2"></i>
|
||||
<span class="d-flex flex-column align-items-start">
|
||||
<span class="fs-5"><TL>Files</TL></span>
|
||||
<span class="fs-5">
|
||||
<TL>Files</TL>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -126,7 +144,9 @@
|
|||
<a href="/server/@(CurrentServer.Uuid)/backups" class="nav-link w-100 btn btn-flex @(Index == 2 ? "active" : "") btn-active-light-primary">
|
||||
<i class="bx bx-box bx-sm me-2"></i>
|
||||
<span class="d-flex flex-column align-items-start">
|
||||
<span class="fs-5"><TL>Backups</TL></span>
|
||||
<span class="fs-5">
|
||||
<TL>Backups</TL>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -134,7 +154,9 @@
|
|||
<a href="/server/@(CurrentServer.Uuid)/network" class="nav-link w-100 btn btn-flex @(Index == 3 ? "active" : "") btn-active-light-primary">
|
||||
<i class="bx bx-wifi bx-sm me-2"></i>
|
||||
<span class="d-flex flex-column align-items-start">
|
||||
<span class="fs-5"><TL>Network</TL></span>
|
||||
<span class="fs-5">
|
||||
<TL>Network</TL>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -142,7 +164,9 @@
|
|||
<a href="/server/@(CurrentServer.Uuid)/addons" class="nav-link w-100 btn btn-flex @(Index == 4 ? "active" : "") btn-active-light-primary">
|
||||
<i class="bx bx-plug bx-sm me-2"></i>
|
||||
<span class="d-flex flex-column align-items-start">
|
||||
<span class="fs-5"><TL>Addons</TL></span>
|
||||
<span class="fs-5">
|
||||
<TL>Addons</TL>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -150,7 +174,9 @@
|
|||
<a href="/server/@(CurrentServer.Uuid)/settings" class="nav-link w-100 btn btn-flex @(Index == 5 ? "active" : "") btn-active-light-primary">
|
||||
<i class="bx bx-cog bx-sm me-2"></i>
|
||||
<span class="d-flex flex-column align-items-start">
|
||||
<span class="fs-5"><TL>Settings</TL></span>
|
||||
<span class="fs-5">
|
||||
<TL>Settings</TL>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -169,7 +195,7 @@
|
|||
{
|
||||
[CascadingParameter]
|
||||
public Server CurrentServer { get; set; }
|
||||
|
||||
|
||||
[CascadingParameter]
|
||||
public User User { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -221,6 +221,8 @@
|
|||
{
|
||||
ServerGroups = (JsonConvert.DeserializeObject<ServerGroup[]>(
|
||||
User.ServerListLayoutJson) ?? Array.Empty<ServerGroup>()).ToList();
|
||||
|
||||
await CheckServerGroups();
|
||||
}
|
||||
|
||||
foreach (var server in AllServers)
|
||||
|
|
@ -256,8 +258,8 @@
|
|||
private async Task RemoveGroup(ServerGroup group)
|
||||
{
|
||||
ServerGroups.Remove(group);
|
||||
await EnsureAllServersInGroups();
|
||||
|
||||
|
||||
await CheckServerGroups();
|
||||
await InvokeAsync(StateHasChanged);
|
||||
|
||||
await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
|
||||
|
|
@ -266,11 +268,10 @@
|
|||
private async Task SetEditMode(bool toggle)
|
||||
{
|
||||
EditMode = toggle;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
|
||||
if (EditMode)
|
||||
{
|
||||
await EnsureAllServersInGroups();
|
||||
await CheckServerGroups();
|
||||
await InvokeAsync(StateHasChanged);
|
||||
|
||||
await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
|
||||
|
|
@ -278,6 +279,9 @@
|
|||
else
|
||||
{
|
||||
var json = JsonConvert.SerializeObject(await GetGroupsFromClient());
|
||||
|
||||
await CheckServerGroups();
|
||||
|
||||
User.ServerListLayoutJson = json;
|
||||
UserRepository.Update(User);
|
||||
|
||||
|
|
@ -289,7 +293,7 @@
|
|||
{
|
||||
var serverGroups = await JsRuntime.InvokeAsync<ServerGroup[]>("moonlight.serverList.getData");
|
||||
|
||||
// Check user data to prevent users from doing stupid stuff
|
||||
// Check user data to prevent users from doing stupid stuff
|
||||
foreach (var serverGroup in serverGroups)
|
||||
{
|
||||
if (serverGroup.Name.Length > 30)
|
||||
|
|
@ -297,53 +301,78 @@
|
|||
Logger.Verbose("Server list group lenght too long");
|
||||
return Array.Empty<ServerGroup>();
|
||||
}
|
||||
|
||||
if (serverGroup.Servers.Any(x => AllServers.All(y => y.Id.ToString() != x)))
|
||||
{
|
||||
Logger.Verbose("User tried to add a server in his server list which he has no access to");
|
||||
return Array.Empty<ServerGroup>();
|
||||
}
|
||||
}
|
||||
|
||||
return serverGroups;
|
||||
}
|
||||
|
||||
private Task EnsureAllServersInGroups()
|
||||
private Task CheckServerGroups()
|
||||
{
|
||||
var presentInGroup = new List<Server>();
|
||||
var result = new List<ServerGroup>();
|
||||
|
||||
// Reconstruct the data with checking for invalid server ids
|
||||
foreach (var group in ServerGroups)
|
||||
{
|
||||
var checkedGroup = new ServerGroup()
|
||||
{
|
||||
Name = group.Name
|
||||
};
|
||||
|
||||
foreach (var server in group.Servers)
|
||||
{
|
||||
var s = AllServers.FirstOrDefault(x => x.Id.ToString() == server);
|
||||
|
||||
if (s != null) // This is a check for invalid server ids
|
||||
{
|
||||
checkedGroup.Servers.Add(s.Id.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
result.Add(checkedGroup);
|
||||
}
|
||||
|
||||
var presentInGroup = new List<Server>();
|
||||
|
||||
// Copy all servers to preset in group if they are in the users servers
|
||||
foreach (var group in result)
|
||||
{
|
||||
foreach (var id in group.Servers)
|
||||
presentInGroup.Add(AllServers.First(x => x.Id.ToString() == id));
|
||||
{
|
||||
var s = AllServers.First(x => x.Id.ToString() == id);
|
||||
presentInGroup.Add(s);
|
||||
}
|
||||
}
|
||||
|
||||
var serversMissing = new List<Server>();
|
||||
|
||||
// Make a list of missing servers
|
||||
foreach (var server in AllServers)
|
||||
{
|
||||
if (presentInGroup.All(x => x.Id != server.Id))
|
||||
serversMissing.Add(server);
|
||||
}
|
||||
|
||||
// Add all missing servers into the default group
|
||||
if (serversMissing.Any())
|
||||
{
|
||||
var defaultGroup = ServerGroups.FirstOrDefault(x => x.Name == "");
|
||||
var defaultGroup = result.FirstOrDefault(x => x.Name == "");
|
||||
|
||||
if (defaultGroup == null)
|
||||
if (defaultGroup == null) // If group does not exist, create it
|
||||
{
|
||||
defaultGroup = new ServerGroup()
|
||||
{
|
||||
Name = ""
|
||||
};
|
||||
|
||||
ServerGroups.Add(defaultGroup);
|
||||
result.Add(defaultGroup);
|
||||
}
|
||||
|
||||
foreach (var server in serversMissing)
|
||||
defaultGroup.Servers.Add(server.Id.ToString());
|
||||
}
|
||||
|
||||
ServerGroups = result;
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
|
@ -351,8 +380,11 @@
|
|||
{
|
||||
lock (StatusCache)
|
||||
{
|
||||
StatusCache.Add(server, status);
|
||||
InvokeAsync(StateHasChanged);
|
||||
if (!StatusCache.ContainsKey(server))
|
||||
{
|
||||
StatusCache.Add(server, status);
|
||||
InvokeAsync(StateHasChanged);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue