Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash when deleting images

Browse Source
This commit is contained in:
Marcel Baumgartner
2024-04-11 08:41:43 +02:00
parent 752f84127c
commit b81646c1d4
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Moonlight/Features/Servers/UI/Views/Admin/Images/Index.razor
View File

@@ -32,6 +32,7 @@
Load="Load" Load="Load"
ValidateDelete="ValidateDelete" ValidateDelete="ValidateDelete"
ValidateAdd="ValidateAdd" ValidateAdd="ValidateAdd"
CustomDelete="CustomDelete"
@ref="Crud"> @ref="Crud">
<Actions> <Actions>
<a href="/admin/servers/images/view/@(context.Id)" class="btn btn-icon btn-info"> <a href="/admin/servers/images/view/@(context.Id)" class="btn btn-icon btn-info">
@@ -101,7 +102,30 @@
{ {
if (ServerRepository.Get().Any(x => x.Image.Id == serverImage.Id)) if (ServerRepository.Get().Any(x => x.Image.Id == serverImage.Id))
throw new DisplayException("A server using this image exists. Please delete the servers using this image to continue"); throw new DisplayException("A server using this image exists. Please delete the servers using this image to continue");
return Task.CompletedTask;
}
private Task ValidateAdd(ServerImage image)
{
// Set defaults
image.StopCommand = "^C";
image.StartupCommand = "echo Startup command here";
image.AllocationsNeeded = 1;
image.InstallScript = "#! /bin/bash\necho Done";
image.InstallShell = "/bin/bash";
image.InstallDockerImage = "debian:latest";
image.OnlineDetection = "Running";
image.AllowDockerImageChange = false;
image.DefaultDockerImage = 0;
image.ParseConfiguration = "[]";
return Task.CompletedTask;
}
private Task CustomDelete(ServerImage serverImage)
{
var image = ImageRepository var image = ImageRepository
.Get() .Get()
.Include(x => x.Variables) .Include(x => x.Variables)
@@ -148,28 +172,11 @@
return Task.CompletedTask; return Task.CompletedTask;
} }
private Task ValidateAdd(ServerImage image)
{
// Set defaults
image.StopCommand = "^C";
image.StartupCommand = "echo Startup command here";
image.AllocationsNeeded = 1;
image.InstallScript = "#! /bin/bash\necho Done";
image.InstallShell = "/bin/bash";
image.InstallDockerImage = "debian:latest";
image.OnlineDetection = "Running";
image.AllowDockerImageChange = false;
image.DefaultDockerImage = 0;
image.ParseConfiguration = "[]";
return Task.CompletedTask;
}
private async Task Export(ServerImage image) private async Task Export(ServerImage image)
{ {
var json = await ImageConversionHelper.ExportAsJson(image); var json = await ImageConversionHelper.ExportAsJson(image);
await FileDownloadService.DownloadString($"{image.Name}.json", json); var imageName = image.Name.Replace(" ", "");
await FileDownloadService.DownloadString($"{imageName}.json", json);
await ToastService.Success($"Successfully exported '{image.Name}'"); await ToastService.Success($"Successfully exported '{image.Name}'");
} }