Implemented basic ui for server sharing. Extracted server authorization. Refactoring and small improvements
This commit is contained in:
@@ -11,10 +11,11 @@ public class DefaultServerTabProvider : IServerTabProvider
|
||||
{
|
||||
ServerTab[] tabs =
|
||||
[
|
||||
ServerTab.CreateFromComponent<ConsoleTab>("Console", "console", 0),
|
||||
ServerTab.CreateFromComponent<FilesTab>("Files", "files", 1),
|
||||
ServerTab.CreateFromComponent<VariablesTab>("Variables", "variables", 2),
|
||||
ServerTab.CreateFromComponent<SettingsTab>("Settings", "settings", 10),
|
||||
ServerTab.CreateFromComponent<ConsoleTab>("Console", "console", 0, permission => permission.Name == "console"),
|
||||
ServerTab.CreateFromComponent<FilesTab>("Files", "files", 1, permission => permission.Name == "files"),
|
||||
ServerTab.CreateFromComponent<SharesTab>("Shares", "shares", 2, permission => permission.Name == "shares"),
|
||||
ServerTab.CreateFromComponent<VariablesTab>("Variables", "variables", 9, permission => permission.Name == "variables"),
|
||||
ServerTab.CreateFromComponent<SettingsTab>("Settings", "settings", 10, permission => permission.Name == "settings"),
|
||||
];
|
||||
|
||||
return Task.FromResult(tabs);
|
||||
|
||||
@@ -1,22 +1,29 @@
|
||||
using MoonlightServers.Frontend.UI.Components.Servers.ServerTabs;
|
||||
using MoonlightServers.Shared.Models;
|
||||
|
||||
namespace MoonlightServers.Frontend.Models;
|
||||
|
||||
public class ServerTab
|
||||
public record ServerTab
|
||||
{
|
||||
public string Name { get; private set; }
|
||||
public string Path { get; private set; }
|
||||
public int Priority { get; set; }
|
||||
public Func<ServerSharePermission, bool>? PermissionFilter { get; private set; }
|
||||
public int Priority { get; private set; }
|
||||
public Type ComponentType { get; private set; }
|
||||
|
||||
public static ServerTab CreateFromComponent<T>(string name, string path, int priority) where T : BaseServerTab
|
||||
public static ServerTab CreateFromComponent<T>(
|
||||
string name,
|
||||
string path,
|
||||
int priority,
|
||||
Func<ServerSharePermission, bool>? filter = null) where T : BaseServerTab
|
||||
{
|
||||
return new()
|
||||
{
|
||||
Name = name,
|
||||
Path = path,
|
||||
Priority = priority,
|
||||
ComponentType = typeof(T)
|
||||
ComponentType = typeof(T),
|
||||
PermissionFilter = filter
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,13 @@ public class ServerService
|
||||
$"api/client/servers?page={page}&pageSize={perPage}"
|
||||
);
|
||||
}
|
||||
|
||||
public async Task<PagedData<ServerDetailResponse>> GetSharedServers(int page, int perPage)
|
||||
{
|
||||
return await HttpApiClient.GetJson<PagedData<ServerDetailResponse>>(
|
||||
$"api/client/servers/shared?page={page}&pageSize={perPage}"
|
||||
);
|
||||
}
|
||||
|
||||
public async Task<ServerDetailResponse> GetServer(int serverId)
|
||||
{
|
||||
|
||||
34
MoonlightServers.Frontend/Services/ServerShareService.cs
Normal file
34
MoonlightServers.Frontend/Services/ServerShareService.cs
Normal file
@@ -0,0 +1,34 @@
|
||||
using MoonCore.Attributes;
|
||||
using MoonCore.Helpers;
|
||||
using MoonCore.Models;
|
||||
using MoonlightServers.Shared.Http.Requests.Client.Servers.Shares;
|
||||
using MoonlightServers.Shared.Http.Responses.Client.Servers.Shares;
|
||||
|
||||
namespace MoonlightServers.Frontend.Services;
|
||||
|
||||
[Scoped]
|
||||
public class ServerShareService
|
||||
{
|
||||
private readonly HttpApiClient ApiClient;
|
||||
|
||||
public ServerShareService(HttpApiClient apiClient)
|
||||
{
|
||||
ApiClient = apiClient;
|
||||
}
|
||||
|
||||
public async Task<PagedData<ServerShareResponse>> Get(int id, int page, int pageSize)
|
||||
=> await ApiClient.GetJson<PagedData<ServerShareResponse>>(
|
||||
$"api/client/servers/{id}/shares?page={page}&pageSize={pageSize}");
|
||||
|
||||
public async Task<ServerShareResponse> Get(int id, int shareId)
|
||||
=> await ApiClient.GetJson<ServerShareResponse>($"api/client/servers/{id}/shares/{shareId}");
|
||||
|
||||
public async Task<ServerShareResponse> Create(int id, CreateShareRequest request)
|
||||
=> await ApiClient.PostJson<ServerShareResponse>($"api/client/servers/{id}/shares", request);
|
||||
|
||||
public async Task<ServerShareResponse> Update(int id, int shareId, UpdateShareRequest request)
|
||||
=> await ApiClient.PatchJson<ServerShareResponse>($"api/client/servers/{id}/shares/{shareId}", request);
|
||||
|
||||
public async Task Delete(int id, int shareId)
|
||||
=> await ApiClient.Delete($"api/client/servers/{id}/shares/{shareId}");
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
@using MoonCore.Blazor.Tailwind.Components
|
||||
@using MoonlightServers.Shared.Enums
|
||||
@using MoonlightServers.Shared.Http.Requests.Client.Servers.Shares
|
||||
@using MoonlightServers.Shared.Models
|
||||
|
||||
@inherits MoonCore.Blazor.Tailwind.Modals.Components.BaseModal
|
||||
|
||||
<div class="text-lg font-semibold mb-5">
|
||||
Create a new share
|
||||
</div>
|
||||
|
||||
<HandleForm @ref="HandleForm" Model="Request" OnValidSubmit="OnValidSubmit">
|
||||
<div class="mb-8">
|
||||
<label class="block text-sm font-medium leading-6 text-white">Username</label>
|
||||
<input @bind="Request.Username" type="text" class="form-input w-full"/>
|
||||
</div>
|
||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-y-5 lg:gap-y-3">
|
||||
@foreach (var name in Names)
|
||||
{
|
||||
var i = Permissions.TryGetValue(name, out var permission) ? (int)permission : -1;
|
||||
|
||||
<div class="col-span-1 flex flex-row items-center justify-center lg:justify-start">
|
||||
@name
|
||||
</div>
|
||||
|
||||
<div class="col-span-1 flex flex-row items-center justify-center lg:justify-end">
|
||||
<div class="tabs">
|
||||
<button @onclick="() => Reset(name)"
|
||||
class="tabs-segment @(i == -1 ? "tabs-segment-active" : "")">
|
||||
None
|
||||
</button>
|
||||
<button @onclick="() => Set(name, ServerPermissionType.Read)"
|
||||
class="tabs-segment @(i == 0 ? "tabs-segment-active" : "")">
|
||||
Read
|
||||
</button>
|
||||
<button @onclick="() => Set(name, ServerPermissionType.ReadWrite)"
|
||||
class="tabs-segment @(i == 1 ? "tabs-segment-active" : "")">
|
||||
Read & Write
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</HandleForm>
|
||||
|
||||
<div class="mt-8 flex space-x-2">
|
||||
<WButton OnClick="_ => Hide()" CssClasses="btn btn-secondary grow">Cancel</WButton>
|
||||
<WButton OnClick="_ => Submit()" CssClasses="btn btn-primary grow">Create</WButton>
|
||||
</div>
|
||||
|
||||
@code
|
||||
{
|
||||
[Parameter] public string Username { get; set; }
|
||||
[Parameter] public Func<CreateShareRequest, Task> OnSubmit { get; set; }
|
||||
|
||||
private HandleForm HandleForm;
|
||||
private CreateShareRequest Request;
|
||||
|
||||
private Dictionary<string, ServerPermissionType> Permissions = new();
|
||||
|
||||
private string[] Names =
|
||||
[
|
||||
"console",
|
||||
"power",
|
||||
"shares",
|
||||
"files",
|
||||
"variables",
|
||||
"settings"
|
||||
];
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
Request = new()
|
||||
{
|
||||
Username = Username
|
||||
};
|
||||
}
|
||||
|
||||
private async Task Set(string name, ServerPermissionType type)
|
||||
{
|
||||
Permissions[name] = type;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Reset(string name)
|
||||
{
|
||||
Permissions.Remove(name);
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Submit()
|
||||
=> await HandleForm.Submit();
|
||||
|
||||
private async Task OnValidSubmit()
|
||||
{
|
||||
Request.Permissions = Permissions.Select(x => new ServerSharePermission()
|
||||
{
|
||||
Name = x.Key,
|
||||
Type = x.Value
|
||||
}).ToList();
|
||||
|
||||
await OnSubmit.Invoke(Request);
|
||||
await Hide();
|
||||
}
|
||||
}
|
||||
@@ -124,21 +124,34 @@
|
||||
|
||||
<div class="hidden 2xl:flex items-center justify-end gap-x-3 2xl:col-span-2">
|
||||
|
||||
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex flex-row">
|
||||
<div>
|
||||
<i class="icon-sparkles"></i>
|
||||
@if (Server.Share != null)
|
||||
{
|
||||
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex flex-row col-span-2">
|
||||
<div>
|
||||
<i class="icon-share-2"></i>
|
||||
</div>
|
||||
|
||||
<div class="ms-3">Shared by <span class="text-primary">@Server.Share.SharedBy</span></div>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex flex-row">
|
||||
<div>
|
||||
<i class="icon-sparkles"></i>
|
||||
</div>
|
||||
|
||||
<div class="ms-3">@Server.StarName</div>
|
||||
</div>
|
||||
|
||||
<div class="ms-3">@Server.StarName</div>
|
||||
</div>
|
||||
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex flex-row">
|
||||
<div>
|
||||
<i class="icon-database"></i>
|
||||
</div>
|
||||
|
||||
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex flex-row">
|
||||
<div>
|
||||
<i class="icon-database"></i>
|
||||
<div class="ms-3">@Server.NodeName</div>
|
||||
</div>
|
||||
|
||||
<div class="ms-3">@Server.NodeName</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
[Parameter] public ServerDetailResponse Server { get; set; }
|
||||
[Parameter] public ServerState State { get; set; }
|
||||
[Parameter] public string InitialConsoleMessage { get; set; }
|
||||
[Parameter] public HubConnection HubConnection { get; set; }
|
||||
[Parameter] public HubConnection? HubConnection { get; set; }
|
||||
[Parameter] public Manage Parent { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
@using MoonCore.Blazor.Tailwind.Alerts
|
||||
@using MoonCore.Blazor.Tailwind.Components
|
||||
@using MoonCore.Blazor.Tailwind.Modals
|
||||
@using MoonCore.Blazor.Tailwind.Toasts
|
||||
@using MoonCore.Models
|
||||
@using MoonlightServers.Frontend.Services
|
||||
@using MoonlightServers.Shared.Http.Requests.Client.Servers.Shares
|
||||
@using MoonlightServers.Shared.Http.Responses.Client.Servers.Shares
|
||||
|
||||
@inherits BaseServerTab
|
||||
|
||||
@inject ServerShareService ShareService
|
||||
@inject ModalService ModalService
|
||||
@inject ToastService ToastService
|
||||
@inject AlertService AlertService
|
||||
|
||||
<div class="flex flex-row mb-5">
|
||||
<input @bind="UsernameInput" class="form-input grow placeholder-gray-500 me-1.5" autocomplete="none" placeholder="Enter a username"/>
|
||||
<button @onclick="OpenCreateModal" class="btn btn-primary">
|
||||
<i class="icon-send me-1"></i>
|
||||
<span>Invite</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<LazyLoader @ref="LazyLoader" Load="Load">
|
||||
@if (Shares.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No shares found" Color="text-primary" Icon="icon-search">
|
||||
Enter a username and press invite to share this server to another user
|
||||
</IconAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="grid grid-col-1 gap-y-3">
|
||||
@foreach (var share in Shares)
|
||||
{
|
||||
<div class="col-span-1 card card-body px-5 py-3 flex flex-row items-center justify-between">
|
||||
<div class="flex justify-start font-semibold">
|
||||
<i class="icon-user-round me-2"></i>
|
||||
<span>@share.Username</span>
|
||||
</div>
|
||||
<div class="flex justify-end">
|
||||
<WButton OnClick="_ => OpenUpdateModal(share)" CssClasses="btn btn-primary me-1.5">
|
||||
<i class="icon-settings-2 me-1"></i>
|
||||
<span>Edit</span>
|
||||
</WButton>
|
||||
<WButton OnClick="_ => Delete(share)" CssClasses="btn btn-danger">
|
||||
<i class="icon-trash-2 me-1"></i>
|
||||
<span>Delete</span>
|
||||
</WButton>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</LazyLoader>
|
||||
|
||||
@code
|
||||
{
|
||||
private ServerShareResponse[] Shares;
|
||||
|
||||
private string UsernameInput = "";
|
||||
|
||||
private LazyLoader LazyLoader;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
{
|
||||
Shares = await PagedData<ServerShareResponse>.All(async (page, pageSize)
|
||||
=> await ShareService.Get(Server.Id, page, pageSize)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task OpenCreateModal()
|
||||
{
|
||||
await ModalService.Launch<CreateShareModal>(parameters =>
|
||||
{
|
||||
parameters["Username"] = UsernameInput;
|
||||
parameters["OnSubmit"] = SubmitCreate;
|
||||
}, size: "max-w-2xl");
|
||||
}
|
||||
|
||||
private async Task SubmitCreate(CreateShareRequest request)
|
||||
{
|
||||
await ShareService.Create(Server.Id, request);
|
||||
|
||||
await ToastService.Success("Share successfully created");
|
||||
await LazyLoader.Reload();
|
||||
}
|
||||
|
||||
private async Task OpenUpdateModal(ServerShareResponse share)
|
||||
{
|
||||
await ModalService.Launch<UpdateShareModal>(parameters =>
|
||||
{
|
||||
parameters["Share"] = share;
|
||||
parameters["OnSubmit"] = (UpdateShareRequest request) => SubmitUpdate(share.Id, request);
|
||||
}, size: "max-w-2xl");
|
||||
}
|
||||
|
||||
private async Task SubmitUpdate(int shareId, UpdateShareRequest request)
|
||||
{
|
||||
await ShareService.Update(Server.Id, shareId, request);
|
||||
|
||||
await ToastService.Success("Share successfully updated");
|
||||
await LazyLoader.Reload();
|
||||
}
|
||||
|
||||
private async Task Delete(ServerShareResponse share)
|
||||
{
|
||||
await AlertService.ConfirmDanger(
|
||||
"Share deletion",
|
||||
$"Do you really want to delete the share for the user '{share.Username}'? This cannot be undone",
|
||||
async () =>
|
||||
{
|
||||
await ShareService.Delete(Server.Id, share.Id);
|
||||
|
||||
await ToastService.Success("Successfully deleted share");
|
||||
await LazyLoader.Reload();
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
@using MoonCore.Blazor.Tailwind.Components
|
||||
@using MoonlightServers.Shared.Enums
|
||||
@using MoonlightServers.Shared.Http.Requests.Client.Servers.Shares
|
||||
@using MoonlightServers.Shared.Http.Responses.Client.Servers.Shares
|
||||
@using MoonlightServers.Shared.Models
|
||||
|
||||
@inherits MoonCore.Blazor.Tailwind.Modals.Components.BaseModal
|
||||
|
||||
<div class="text-lg font-semibold mb-5">
|
||||
Update share for @Share.Username
|
||||
</div>
|
||||
|
||||
<HandleForm @ref="HandleForm" Model="Request" OnValidSubmit="OnValidSubmit">
|
||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-y-5 lg:gap-y-3">
|
||||
@foreach (var name in Names)
|
||||
{
|
||||
var i = Permissions.TryGetValue(name, out var permission) ? (int)permission : -1;
|
||||
|
||||
<div class="col-span-1 flex flex-row items-center justify-center lg:justify-start">
|
||||
@name
|
||||
</div>
|
||||
|
||||
<div class="col-span-1 flex flex-row items-center justify-center lg:justify-end">
|
||||
<div class="tabs">
|
||||
<button @onclick="() => Reset(name)"
|
||||
class="tabs-segment @(i == -1 ? "tabs-segment-active" : "")">
|
||||
None
|
||||
</button>
|
||||
<button @onclick="() => Set(name, ServerPermissionType.Read)"
|
||||
class="tabs-segment @(i == 0 ? "tabs-segment-active" : "")">
|
||||
Read
|
||||
</button>
|
||||
<button @onclick="() => Set(name, ServerPermissionType.ReadWrite)"
|
||||
class="tabs-segment @(i == 1 ? "tabs-segment-active" : "")">
|
||||
Read & Write
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</HandleForm>
|
||||
|
||||
<div class="mt-8 flex space-x-2">
|
||||
<WButton OnClick="_ => Hide()" CssClasses="btn btn-secondary grow">Cancel</WButton>
|
||||
<WButton OnClick="_ => Submit()" CssClasses="btn btn-primary grow">Update</WButton>
|
||||
</div>
|
||||
|
||||
@code
|
||||
{
|
||||
[Parameter] public ServerShareResponse Share { get; set; }
|
||||
[Parameter] public Func<UpdateShareRequest, Task> OnSubmit { get; set; }
|
||||
|
||||
private HandleForm HandleForm;
|
||||
private UpdateShareRequest Request;
|
||||
|
||||
private Dictionary<string, ServerPermissionType> Permissions = new();
|
||||
|
||||
private string[] Names =
|
||||
[
|
||||
"console",
|
||||
"power",
|
||||
"shares",
|
||||
"files",
|
||||
"variables",
|
||||
"settings"
|
||||
];
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
Request = new();
|
||||
|
||||
Permissions = Share.Permissions.ToDictionary(x => x.Name, x => x.Type);
|
||||
}
|
||||
|
||||
private async Task Set(string name, ServerPermissionType type)
|
||||
{
|
||||
Permissions[name] = type;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Reset(string name)
|
||||
{
|
||||
Permissions.Remove(name);
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Submit()
|
||||
=> await HandleForm.Submit();
|
||||
|
||||
private async Task OnValidSubmit()
|
||||
{
|
||||
Request.Permissions = Permissions.Select(x => new ServerSharePermission()
|
||||
{
|
||||
Name = x.Key,
|
||||
Type = x.Value
|
||||
}).ToList();
|
||||
|
||||
await OnSubmit.Invoke(Request);
|
||||
await Hide();
|
||||
}
|
||||
}
|
||||
@@ -8,17 +8,19 @@
|
||||
|
||||
@inject ServerService ServerService
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
@if (Servers.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No servers found" Color="text-primary" Icon="icon-search">
|
||||
There are no servers linked to your account
|
||||
</IconAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex flex-col gap-y-5">
|
||||
@* Folder design idea
|
||||
<Tabs>
|
||||
<Tab Name="Your servers">
|
||||
<LazyLoader Load="LoadOwnServers">
|
||||
@if (OwnServers.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No servers found" Color="text-primary" Icon="icon-search">
|
||||
There are no servers linked to your account
|
||||
</IconAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex flex-col gap-y-5">
|
||||
@* Folder design idea
|
||||
<div class="w-full bg-gray-800 px-5 py-3.5 rounded-xl">
|
||||
<div class="flex items-center">
|
||||
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex items-center">
|
||||
@@ -36,22 +38,51 @@
|
||||
</div>
|
||||
</div>
|
||||
*@
|
||||
@foreach (var server in Servers)
|
||||
{
|
||||
<ServerCard Server="server"/>
|
||||
@foreach (var server in OwnServers)
|
||||
{
|
||||
<ServerCard Server="server"/>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</LazyLoader>
|
||||
</LazyLoader>
|
||||
</Tab>
|
||||
<Tab Name="Shared servers">
|
||||
<LazyLoader Load="LoadSharedServers">
|
||||
@if (SharedServers.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No shared servers found" Color="text-primary" Icon="icon-share-2">
|
||||
There are no shared servers linked to your account
|
||||
</IconAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex flex-col gap-y-5">
|
||||
@foreach (var server in SharedServers)
|
||||
{
|
||||
<ServerCard Server="server"/>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</LazyLoader>
|
||||
</Tab>
|
||||
</Tabs>
|
||||
|
||||
@code
|
||||
{
|
||||
private ServerDetailResponse[] Servers;
|
||||
private ServerDetailResponse[] OwnServers;
|
||||
private ServerDetailResponse[] SharedServers;
|
||||
|
||||
private async Task Load(LazyLoader lazyLoader)
|
||||
private async Task LoadOwnServers(LazyLoader lazyLoader)
|
||||
{
|
||||
Servers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
|
||||
OwnServers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
|
||||
await ServerService.GetServers(page, pageSize)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task LoadSharedServers(LazyLoader lazyLoader)
|
||||
{
|
||||
SharedServers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
|
||||
await ServerService.GetSharedServers(page, pageSize)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
@page "/servers/{ServerId:int}"
|
||||
@page "/servers/{ServerId:int}/{TabPath:alpha}"
|
||||
|
||||
@using Microsoft.AspNetCore.Http.Connections
|
||||
@using Microsoft.AspNetCore.SignalR.Client
|
||||
@using MoonCore.Blazor.Tailwind.Components
|
||||
@using MoonCore.Exceptions
|
||||
@@ -66,12 +65,62 @@
|
||||
</div>
|
||||
<div class="flex flex-row items-center">
|
||||
<div class="flex gap-x-1.5">
|
||||
@if (State == ServerState.Offline)
|
||||
@if (HasPermissionTo("power", ServerPermissionType.ReadWrite))
|
||||
{
|
||||
<WButton CssClasses="btn btn-success" OnClick="_ => Start()">
|
||||
<i class="icon-play me-1 align-middle"></i>
|
||||
<span class="align-middle">Start</span>
|
||||
</WButton>
|
||||
@if (State == ServerState.Offline)
|
||||
{
|
||||
<WButton CssClasses="btn btn-success" OnClick="_ => Start()">
|
||||
<i class="icon-play me-1 align-middle"></i>
|
||||
<span class="align-middle">Start</span>
|
||||
</WButton>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button type="button" class="btn btn-success" disabled="disabled">
|
||||
<i class="icon-play me-1 align-middle"></i>
|
||||
<span class="align-middle">Start</span>
|
||||
</button>
|
||||
}
|
||||
|
||||
@if (State == ServerState.Online)
|
||||
{
|
||||
<button type="button" class="btn btn-primary">
|
||||
<i class="icon-rotate-ccw me-1 align-middle"></i>
|
||||
<span class="align-middle">Restart</span>
|
||||
</button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button type="button" class="btn btn-primary" disabled="disabled">
|
||||
<i class="icon-rotate-ccw me-1 align-middle"></i>
|
||||
<span class="align-middle">Restart</span>
|
||||
</button>
|
||||
}
|
||||
|
||||
@if (State == ServerState.Starting || State == ServerState.Online || State == ServerState.Stopping)
|
||||
{
|
||||
if (State == ServerState.Stopping)
|
||||
{
|
||||
<WButton CssClasses="btn btn-danger" OnClick="_ => Kill()">
|
||||
<i class="icon-bomb me-1 align-middle"></i>
|
||||
<span class="align-middle">Kill</span>
|
||||
</WButton>
|
||||
}
|
||||
else
|
||||
{
|
||||
<WButton CssClasses="btn btn-danger" OnClick="_ => Stop()">
|
||||
<i class="icon-squircle me-1 align-middle"></i>
|
||||
<span class="align-middle">Stop</span>
|
||||
</WButton>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<button type="button" class="btn btn-danger" disabled="disabled">
|
||||
<i class="icon-squircle me-1 align-middle"></i>
|
||||
<span class="align-middle">Stop</span>
|
||||
</button>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -79,42 +128,12 @@
|
||||
<i class="icon-play me-1 align-middle"></i>
|
||||
<span class="align-middle">Start</span>
|
||||
</button>
|
||||
}
|
||||
|
||||
@if (State == ServerState.Online)
|
||||
{
|
||||
<button type="button" class="btn btn-primary">
|
||||
<i class="icon-rotate-ccw me-1 align-middle"></i>
|
||||
<span class="align-middle">Restart</span>
|
||||
</button>
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
<button type="button" class="btn btn-primary" disabled="disabled">
|
||||
<i class="icon-rotate-ccw me-1 align-middle"></i>
|
||||
<span class="align-middle">Restart</span>
|
||||
</button>
|
||||
}
|
||||
|
||||
@if (State == ServerState.Starting || State == ServerState.Online || State == ServerState.Stopping)
|
||||
{
|
||||
if (State == ServerState.Stopping)
|
||||
{
|
||||
<WButton CssClasses="btn btn-danger" OnClick="_ => Kill()">
|
||||
<i class="icon-bomb me-1 align-middle"></i>
|
||||
<span class="align-middle">Kill</span>
|
||||
</WButton>
|
||||
}
|
||||
else
|
||||
{
|
||||
<WButton CssClasses="btn btn-danger" OnClick="_ => Stop()">
|
||||
<i class="icon-squircle me-1 align-middle"></i>
|
||||
<span class="align-middle">Stop</span>
|
||||
</WButton>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
<button type="button" class="btn btn-danger" disabled="disabled">
|
||||
<i class="icon-squircle me-1 align-middle"></i>
|
||||
<span class="align-middle">Stop</span>
|
||||
@@ -148,19 +167,26 @@
|
||||
}
|
||||
</ul>
|
||||
|
||||
@{
|
||||
var rf = ComponentHelper.FromType(CurrentTab!.ComponentType, parameters =>
|
||||
{
|
||||
parameters.Add("Server", Server);
|
||||
parameters.Add("State", State);
|
||||
parameters.Add("InitialConsoleMessage", InitialConsoleMessage);
|
||||
parameters.Add("HubConnection", HubConnection);
|
||||
parameters.Add("Parent", this);
|
||||
});
|
||||
}
|
||||
|
||||
<div class="mt-5">
|
||||
@rf
|
||||
@if (CurrentTab == null)
|
||||
{
|
||||
<IconAlert Title="No tabs found" Color="text-primary" Icon="icon-app-window">
|
||||
Seems like you are missing access to all tabs or no tabs for this server could be found
|
||||
</IconAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
var rf = ComponentHelper.FromType(CurrentTab!.ComponentType, parameters =>
|
||||
{
|
||||
parameters.Add("Server", Server);
|
||||
parameters.Add("State", State);
|
||||
parameters.Add("InitialConsoleMessage", InitialConsoleMessage);
|
||||
parameters.Add("HubConnection", HubConnection!);
|
||||
parameters.Add("Parent", this);
|
||||
});
|
||||
|
||||
@rf
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@@ -177,9 +203,9 @@
|
||||
private ServerDetailResponse Server;
|
||||
private bool NotFound = false;
|
||||
private ServerState State;
|
||||
private string InitialConsoleMessage;
|
||||
private string InitialConsoleMessage = "";
|
||||
|
||||
private HubConnection HubConnection;
|
||||
private HubConnection? HubConnection;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
{
|
||||
@@ -194,24 +220,39 @@
|
||||
foreach (var serverTabProvider in TabProviders)
|
||||
tmpTabs.AddRange(await serverTabProvider.GetTabs(Server));
|
||||
|
||||
// If we are accessing a shared server, we need to handle permissions
|
||||
if (Server.Share != null)
|
||||
{
|
||||
// This removes all tabs where the permission filter is not set
|
||||
tmpTabs.RemoveAll(tab =>
|
||||
{
|
||||
if (tab.PermissionFilter == null)
|
||||
return false;
|
||||
|
||||
return !Server.Share.Permissions.Any(tab.PermissionFilter);
|
||||
});
|
||||
}
|
||||
|
||||
Tabs = tmpTabs.OrderBy(x => x.Priority).ToArray();
|
||||
|
||||
// Find current tab
|
||||
if (!string.IsNullOrEmpty(TabPath))
|
||||
{
|
||||
CurrentTab = Tabs.FirstOrDefault(
|
||||
x => TabPath.Equals(x.Path, StringComparison.InvariantCultureIgnoreCase)
|
||||
CurrentTab = Tabs.FirstOrDefault(x => TabPath.Equals(x.Path, StringComparison.InvariantCultureIgnoreCase)
|
||||
);
|
||||
}
|
||||
|
||||
if (CurrentTab == null)
|
||||
CurrentTab = Tabs.First();
|
||||
CurrentTab = Tabs.FirstOrDefault();
|
||||
|
||||
// Load initial status for first render
|
||||
var status = await ServerService.GetStatus(ServerId);
|
||||
|
||||
State = status.State;
|
||||
|
||||
if (!HasPermissionTo("console", ServerPermissionType.Read))
|
||||
return; // Exit early if we don't have permissions to load the console
|
||||
|
||||
// Load initial messages
|
||||
var initialLogs = await ServerService.GetLogs(ServerId);
|
||||
|
||||
@@ -265,6 +306,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
private bool HasPermissionTo(string name, ServerPermissionType type)
|
||||
{
|
||||
// All non shares have permissions
|
||||
if (Server.Share == null)
|
||||
return true;
|
||||
|
||||
return Server.Share.Permissions.Any(x => x.Name == name && x.Type >= type);
|
||||
}
|
||||
|
||||
private async Task SwitchTab(ServerTab tab)
|
||||
{
|
||||
CurrentTab = tab;
|
||||
@@ -284,9 +334,12 @@
|
||||
|
||||
public async ValueTask DisposeAsync()
|
||||
{
|
||||
if (HubConnection.State == HubConnectionState.Connected)
|
||||
await HubConnection.StopAsync();
|
||||
if (HubConnection != null)
|
||||
{
|
||||
if (HubConnection.State == HubConnectionState.Connected)
|
||||
await HubConnection.StopAsync();
|
||||
|
||||
await HubConnection.DisposeAsync();
|
||||
await HubConnection.DisposeAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user