From 4e5124cc1b12541502a0828976c680056e007f5c Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Sun, 28 Jan 2024 17:50:20 +0100 Subject: [PATCH] Added image update pages. Added forms models. Implemented parts of the image editor components --- .../UI/Components/Forms/AutoListCrud.razor | 13 +- .../Core/UI/Components/Partials/Sidebar.razor | 11 ++ .../Forms/Admin/Images/CreateDockerImage.cs | 18 ++ .../Forms/Admin/Images/CreateImageForm.cs | 19 +++ .../Images/{ => Parsing}/ParseConfigForm.cs | 2 +- .../{ => Parsing}/ParseConfigOptionForm.cs | 2 +- .../Forms/Admin/Images/UpdateDockerImage.cs | 18 ++ .../Admin/Images/UpdateImageDetailsForm.cs | 23 +++ .../Forms/Admin/Images/UpdateImageForm.cs | 19 +++ .../Images/UpdateImageInstallationForm.cs | 18 ++ .../Components/AdminImageViewNavigation.razor | 43 +++++ .../Servers/UI/Components/ImageEditor.razor | 154 ------------------ .../UI/Components/ParseConfigEditor.razor | 1 + .../Servers/UI/Views/Admin/Images/Index.razor | 13 +- .../Servers/UI/Views/Admin/Images/New.razor | 47 +++++- .../Admin/Images/View/ConfigParsing.razor | 35 ++++ .../UI/Views/Admin/Images/View/Details.razor | 70 ++++++++ .../Admin/Images/View/DockerImages.razor | 65 ++++++++ .../UI/Views/Admin/Images/View/Index.razor | 70 ++++++++ .../Admin/Images/View/Installation.razor | 70 ++++++++ .../Views/Admin/Images/View/Variables.razor | 35 ++++ 21 files changed, 585 insertions(+), 161 deletions(-) create mode 100644 Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateDockerImage.cs create mode 100644 Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateImageForm.cs rename Moonlight/Features/Servers/Models/Forms/Admin/Images/{ => Parsing}/ParseConfigForm.cs (82%) rename Moonlight/Features/Servers/Models/Forms/Admin/Images/{ => Parsing}/ParseConfigOptionForm.cs (76%) create mode 100644 Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateDockerImage.cs create mode 100644 Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageDetailsForm.cs create mode 100644 Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageForm.cs create mode 100644 Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageInstallationForm.cs create mode 100644 Moonlight/Features/Servers/UI/Components/AdminImageViewNavigation.razor delete mode 100644 Moonlight/Features/Servers/UI/Components/ImageEditor.razor create mode 100644 Moonlight/Features/Servers/UI/Views/Admin/Images/View/ConfigParsing.razor create mode 100644 Moonlight/Features/Servers/UI/Views/Admin/Images/View/Details.razor create mode 100644 Moonlight/Features/Servers/UI/Views/Admin/Images/View/DockerImages.razor create mode 100644 Moonlight/Features/Servers/UI/Views/Admin/Images/View/Index.razor create mode 100644 Moonlight/Features/Servers/UI/Views/Admin/Images/View/Installation.razor create mode 100644 Moonlight/Features/Servers/UI/Views/Admin/Images/View/Variables.razor diff --git a/Moonlight/Core/UI/Components/Forms/AutoListCrud.razor b/Moonlight/Core/UI/Components/Forms/AutoListCrud.razor index 3945be9..6d1dc2d 100644 --- a/Moonlight/Core/UI/Components/Forms/AutoListCrud.razor +++ b/Moonlight/Core/UI/Components/Forms/AutoListCrud.razor @@ -1,6 +1,7 @@ @using BlazorTable @using System.Linq.Expressions @using Mappy.Net +@using Moonlight.Core.Repositories @using Moonlight.Core.Services.Interop @typeparam TItem where TItem : class @@ -9,6 +10,8 @@ @typeparam TUpdateForm @inject ToastService ToastService +@inject Repository RootRepository +@inject Repository ItemRepository
@@ -174,7 +177,7 @@ if (ValidateUpdate != null) // Optional additional validation await ValidateUpdate.Invoke(item); - //ItemRepository.Update(item); + ItemRepository.Update(item); // Reset await UpdateModal.Hide(); @@ -196,6 +199,7 @@ await ValidateAdd.Invoke(item); Field.Invoke(RootItem).Add(item); + RootRepository.Update(RootItem); // Reset await CreateModal.Hide(); @@ -215,6 +219,13 @@ await ValidateDelete.Invoke(ItemToDelete); Field.Invoke(RootItem).Remove(ItemToDelete); + RootRepository.Update(RootItem); + + try + { + ItemRepository.Delete(ItemToDelete); + } + catch (Exception) { /* ignored, as we dont want such an operation to fail the request */ } // Reset await DeleteModal.Hide(); diff --git a/Moonlight/Core/UI/Components/Partials/Sidebar.razor b/Moonlight/Core/UI/Components/Partials/Sidebar.razor index f03f3b4..61e6adf 100644 --- a/Moonlight/Core/UI/Components/Partials/Sidebar.razor +++ b/Moonlight/Core/UI/Components/Partials/Sidebar.razor @@ -94,6 +94,17 @@
+ +
+ + + + + + Servers + + +
diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateDockerImage.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateDockerImage.cs new file mode 100644 index 0000000..3b1a2c7 --- /dev/null +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateDockerImage.cs @@ -0,0 +1,18 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; + +public class CreateDockerImage +{ + [Required(ErrorMessage = "You need to specify a docker image name")] + [Description("This is the name of the docker image. E.g. moonlightpanel/moonlight:canary")] + public string Name { get; set; } + + [Required(ErrorMessage = "You need to specify a display name")] + [Description("This will be shown if the user is able to change the docker image as the image name")] + public string DisplayName { get; set; } + + [Description("Specifies if the docker image should be pulled/updated when creating a server instance. Disable this for only local existing docker images")] + public bool AutoPull { get; set; } = true; +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateImageForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateImageForm.cs new file mode 100644 index 0000000..db9d95d --- /dev/null +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/CreateImageForm.cs @@ -0,0 +1,19 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; + +public class CreateImageForm +{ + [Required(ErrorMessage = "You need to specify a name")] + public string Name { get; set; } + + [Required(ErrorMessage = "You need to specify a author")] + public string Author { get; set; } + + [Description("The donate button on your image will lead to the page you specify here")] + public string? DonateUrl { get; set; } + + [Description("This field allows you to specify an direct http(s) url to fetch image updates from")] + public string? UpdateUrl { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/ParseConfigForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/Parsing/ParseConfigForm.cs similarity index 82% rename from Moonlight/Features/Servers/Models/Forms/Admin/Images/ParseConfigForm.cs rename to Moonlight/Features/Servers/Models/Forms/Admin/Images/Parsing/ParseConfigForm.cs index ecff53e..294f562 100644 --- a/Moonlight/Features/Servers/Models/Forms/Admin/Images/ParseConfigForm.cs +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/Parsing/ParseConfigForm.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images.Parsing; public class ParseConfigForm { diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/ParseConfigOptionForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/Parsing/ParseConfigOptionForm.cs similarity index 76% rename from Moonlight/Features/Servers/Models/Forms/Admin/Images/ParseConfigOptionForm.cs rename to Moonlight/Features/Servers/Models/Forms/Admin/Images/Parsing/ParseConfigOptionForm.cs index 0fdc0b4..5c8e2c2 100644 --- a/Moonlight/Features/Servers/Models/Forms/Admin/Images/ParseConfigOptionForm.cs +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/Parsing/ParseConfigOptionForm.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images.Parsing; public class ParseConfigOptionForm { diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateDockerImage.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateDockerImage.cs new file mode 100644 index 0000000..6a4cdb9 --- /dev/null +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateDockerImage.cs @@ -0,0 +1,18 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; + +public class UpdateDockerImage +{ + [Required(ErrorMessage = "You need to specify a docker image name")] + [Description("This is the name of the docker image. E.g. moonlightpanel/moonlight:canary")] + public string Name { get; set; } + + [Required(ErrorMessage = "You need to specify a display name")] + [Description("This will be shown if the user is able to change the docker image as the image name")] + public string DisplayName { get; set; } + + [Description("Specifies if the docker image should be pulled/updated when creating a server instance. Disable this for only local existing docker images")] + public bool AutoPull { get; set; } = true; +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageDetailsForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageDetailsForm.cs new file mode 100644 index 0000000..226bd81 --- /dev/null +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageDetailsForm.cs @@ -0,0 +1,23 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; + +public class UpdateImageDetailsForm +{ + [Description("The allocations (aka. ports) a image needs in order to be created")] + [Range(1, int.MaxValue)] + public int AllocationsNeeded { get; set; } + + [Required(ErrorMessage = "You need to specify a startup command")] + [Description("This command gets passed to the container of the image to execute")] + public string StartupCommand { get; set; } + + [Required(ErrorMessage = "You need to specify a stop command")] + [Description("This command will get written into the input stream of the server process when the server should get stopped")] + public string StopCommand { get; set; } + + [Required(ErrorMessage = "You need to specify a online detection")] + [Description("The regex string you specify here will be used in order to detect if a server is up and running")] + public string OnlineDetection { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageForm.cs new file mode 100644 index 0000000..091bdb6 --- /dev/null +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageForm.cs @@ -0,0 +1,19 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; + +public class UpdateImageForm +{ + [Required(ErrorMessage = "You need to specify a name")] + public string Name { get; set; } + + [Required(ErrorMessage = "You need to specify a author")] + public string Author { get; set; } + + [Description("The donate button on your image will lead to the page you specify here")] + public string? DonateUrl { get; set; } + + [Description("This field allows you to specify an direct http(s) url to fetch image updates from")] + public string? UpdateUrl { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageInstallationForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageInstallationForm.cs new file mode 100644 index 0000000..eff3cab --- /dev/null +++ b/Moonlight/Features/Servers/Models/Forms/Admin/Images/UpdateImageInstallationForm.cs @@ -0,0 +1,18 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.Features.Servers.Models.Forms.Admin.Images; + +public class UpdateImageInstallationForm +{ + [Required(ErrorMessage = "You need to specify a install docker image")] + [Description("This specifies the docker image to use for the script execution")] + public string InstallDockerImage { get; set; } + + [Required(ErrorMessage = "You need to specify a install shell")] + [Description("This is the shell to pass the install script to")] + public string InstallShell { get; set; } + + [Required(ErrorMessage = "You need to specify a install script")] + public string InstallScript { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/UI/Components/AdminImageViewNavigation.razor b/Moonlight/Features/Servers/UI/Components/AdminImageViewNavigation.razor new file mode 100644 index 0000000..169f9bc --- /dev/null +++ b/Moonlight/Features/Servers/UI/Components/AdminImageViewNavigation.razor @@ -0,0 +1,43 @@ +
+
+ +
+
+ +@code +{ + [Parameter] public int Index { get; set; } + + [Parameter] public int ImageId { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Features/Servers/UI/Components/ImageEditor.razor b/Moonlight/Features/Servers/UI/Components/ImageEditor.razor deleted file mode 100644 index 5bddd99..0000000 --- a/Moonlight/Features/Servers/UI/Components/ImageEditor.razor +++ /dev/null @@ -1,154 +0,0 @@ - -
-
- General -
-
-
-
- - -
-
- - -
-
- -
- (Optional) URL to link donation pages for the author -
- -
-
- -
- (Optional) URL to enable auto updates on images. This link needs to be a direct download link to a json file -
- -
-
-
-
-
-
- Installation -
-
-
-
- -
- This specifies the docker image to use for the script execution -
- -
-
- -
- This is the shell to pass the install script to -
- -
-
- @* TODO: Add vscode editor or similar *@ - - -
-
-
-
- Startup, Control & Allocations -
-
- -
- This command gets passed to the container of the image to execute. Server variables can be used here -
- -
-
- -
- This command will get written into the input stream of the server process when the server should get stopped -
- -
-
- -
- The regex string you specify here will be used in order to detect if a server is up and running -
- -
-
- -
- The allocations (aka. ports) a image needs in order to be created -
- -
-
-
-
-
-
- Docker images -
- -
-
-
-
- @foreach (var dockerImage in DockerImages) - { -
-
- - Remove -
-
- } -
-
-
-
-
- Variables -
- -
-
-
-
- @foreach (var variable in Variables) - { -
-
- - - Remove -
-
- } -
-
-
-
- -
-
-
- -
-
- - -@code -{ - -} diff --git a/Moonlight/Features/Servers/UI/Components/ParseConfigEditor.razor b/Moonlight/Features/Servers/UI/Components/ParseConfigEditor.razor index 2f5e40b..e5c12fe 100644 --- a/Moonlight/Features/Servers/UI/Components/ParseConfigEditor.razor +++ b/Moonlight/Features/Servers/UI/Components/ParseConfigEditor.razor @@ -3,6 +3,7 @@ @using Moonlight.Core.Helpers @using Moonlight.Features.Servers.Models @using Moonlight.Features.Servers.Models.Forms.Admin.Images +@using Moonlight.Features.Servers.Models.Forms.Admin.Images.Parsing
diff --git a/Moonlight/Features/Servers/UI/Views/Admin/Images/Index.razor b/Moonlight/Features/Servers/UI/Views/Admin/Images/Index.razor index eba6f84..1d99706 100644 --- a/Moonlight/Features/Servers/UI/Views/Admin/Images/Index.razor +++ b/Moonlight/Features/Servers/UI/Views/Admin/Images/Index.razor @@ -6,6 +6,7 @@ @using Moonlight.Core.Repositories @using Moonlight.Core.Services.Interop @using Moonlight.Features.Servers.Entities +@using Moonlight.Features.Servers.UI.Components @inject Repository ImageRepository @inject Repository ImageVariableRepository @@ -13,6 +14,8 @@ @inject Repository ServerRepository @inject ToastService ToastService + +

Manage server images

@@ -30,7 +33,13 @@ TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3 fs-6" TableHeadClass="fw-bold text-muted"> - + + +