Merge pull request #99 from Moonlight-Panel/FixImageImportExport

Fixed import and export

Moonlight/App/Database/Entities/DockerImage.cs

@@ -1,7 +1,10 @@
-namespace Moonlight.App.Database.Entities;
+using Newtonsoft.Json;
+
+namespace Moonlight.App.Database.Entities;
 
 public class DockerImage
 {
+    [JsonIgnore]
     public int Id { get; set; }
     public bool Default { get; set; } = false;
     public string Name { get; set; } = "";

Moonlight/App/Database/Entities/Image.cs

@@ -1,7 +1,10 @@
-namespace Moonlight.App.Database.Entities;
+using Newtonsoft.Json;
+
+namespace Moonlight.App.Database.Entities;
 
 public class Image
 {
+    [JsonIgnore]
     public int Id { get; set; }
     public Guid Uuid { get; set; }
     public string Name { get; set; } = "";

Moonlight/App/Database/Entities/ImageVariable.cs

@@ -1,7 +1,10 @@
-namespace Moonlight.App.Database.Entities;
+using Newtonsoft.Json;
+
+namespace Moonlight.App.Database.Entities;
 
 public class ImageVariable
 {
+    [JsonIgnore]
     public int Id { get; set; }
     public string Key { get; set; } = "";
     public string DefaultValue { get; set; } = "";

Moonlight/Shared/Views/Admin/Servers/Images/Index.razor

@@ -14,8 +14,7 @@
 @inject Repository<ImageVariable> ImageVariableRepository
 @inject Repository<Server> ServerRepository
 @inject SmartTranslateService SmartTranslateService
-@inject ToastService ToastService
+@inject AlertService AlertService
-@inject NavigationManager NavigationManager
 
 <OnlyAdmin>
     <div class="row">
@@ -33,13 +32,7 @@
                             <TL>New image</TL>
                         </a>
                         <InputFile OnChange="OnFileChanged" type="file" id="fileUpload" hidden="" multiple=""/>
-                        <label for="fileUpload" class="btn btn-sm btn-light-primary @(Uploading ? "disabled" : "")">
+                        <label for="fileUpload" class="btn btn-sm btn-light-primary">
-                            @if (Uploading)
-                            {
-                                <span>@(Percent)%</span>
-                            }
-                            else
-                            {
                             <span class="svg-icon svg-icon-2">
                                 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                                     <path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="currentColor"></path>
@@ -48,7 +41,6 @@
                                 </svg>
                             </span>
                             <TL>Import</TL>
-                            }
                         </label>
                     </div>
                 </div>
@@ -108,10 +100,7 @@
     private Image[] Images;
     private LazyLoader LazyLoader;
 
-    private Dictionary<Image, int> ServersCount = new();
+    private readonly Dictionary<Image, int> ServersCount = new();
-    
-    private bool Uploading = false;
-    private int Percent = 0;
 
     private async Task Load(LazyLoader lazyLoader)
     {
@@ -156,63 +145,32 @@
     
     private async Task OnFileChanged(InputFileChangeEventArgs arg)
     {
-        await ToastService.CreateProcessToast("upload", SmartTranslateService.Translate("Uploading files"));
-
-        Uploading = true;
-        await InvokeAsync(StateHasChanged);
-
-        int i = 1;
         foreach (var browserFile in arg.GetMultipleFiles())
         {
-            if (browserFile.Size < 1024 * 1024 * 100)
-            {
-                Percent = 0;
-
             try
             {
                 var stream = browserFile.OpenReadStream(1024 * 1024 * 100);
                 var data = new byte[browserFile.Size];
-                    await stream.ReadAsync(data, 0, data.Length);
+                _ = await stream.ReadAsync(data, 0, data.Length);
-                    Percent = 50;
 
                 var text = Encoding.UTF8.GetString(data);
+                var image = JsonConvert.DeserializeObject<Image>(text)!;
                     
-                    var image = JsonConvert.DeserializeObject<Image>(text);
+                image.Uuid = Guid.NewGuid();
-                    foreach (var imageDockerImage in image.DockerImages)
-                    {
-                        imageDockerImage.Id = 0;
-                    }
-                    foreach (var imageVariable in image.Variables)
-                    {
-                        imageVariable.Id = 0;
-                    }
-                    image.Id = 0;
 
-                    image = ImageRepository.Add(image);
+                ImageRepository.Add(image);
 
-                    NavigationManager.NavigateTo("/admin/servers/images/edit/" + image.Id);
+                await AlertService.Success(SmartTranslateService.Translate("Successfully imported image"));
+                await LazyLoader.Reload();
             }
             catch (Exception e)
             {
-                    await ToastService.Error(SmartTranslateService.Translate("An unknown error occured while uploading and importing the image"));
+                await AlertService.Error(SmartTranslateService.Translate("An unknown error occured while uploading and importing the image"));
-                    Logger.Error("Error uploading file");
+                Logger.Error("Error importing image");
                 Logger.Error(e);
             }
-
-                await ToastService.UpdateProcessToast("upload", $"{i}/{arg.GetMultipleFiles().Count} {SmartTranslateService.Translate("complete")}");
-            }
-            else
-            {
-                await ToastService.Error(SmartTranslateService.Translate("The uploaded file should not be bigger than 100MB"));
         }
         
-            i++;
-        }
-
-        Uploading = false;
         await InvokeAsync(StateHasChanged);
-
-        await ToastService.UpdateProcessToast("upload", SmartTranslateService.Translate("Upload complete"));
-        await ToastService.RemoveProcessToast("upload");
     }
 }