Merge pull request 'Added image deletion functionality to product creation' (#20) from products into master

Reviewed-on: #20

ShopAdmin/Components/CreateProduct.razor.cs

@@ -1,6 +1,4 @@
 using LiteCharms.Features.S3.Abstractions;
-using Microsoft.AspNetCore.Components.Forms;
-using System.ComponentModel.DataAnnotations;
 using static LiteCharms.Features.S3.Constants;
 
 namespace ShopAdmin.Components;
@@ -16,6 +14,8 @@ public partial class CreateProduct([FromKeyedServices(BookshopBucketName)] IS3Se
 
     private const long MaxAllowedFileSize = 1024 * 1024 * 5;
 
+    private readonly Func<string, string> GetFileKeyFromUrl = url => url.Split('/').Last();
+
     protected override void OnInitialized()
     {
         base.OnInitialized();
@@ -26,15 +26,11 @@ public partial class CreateProduct([FromKeyedServices(BookshopBucketName)] IS3Se
             ProductModel.Thumbnails = [.. Enumerable.Repeat(string.Empty, 5)];
     }
 
-    // Your saving logic goes here when the ledger button is clicked
     public Task HandleValidSubmit() => Task.CompletedTask;
 
-    // Checks if a valid URL asset exists at the specified position
+    public bool HasAssetAt(int index) => (ProductModel?.Thumbnails) != null && index < ProductModel.Thumbnails.Count &&
-    public bool HasAssetAt(int index) => ProductModel?.Thumbnails == null || index >= ProductModel.Thumbnails.Count
+        !string.IsNullOrWhiteSpace(ProductModel.Thumbnails[index]);
-        ? false
-        : !string.IsNullOrWhiteSpace(ProductModel.Thumbnails[index]);
 
-    // Handles uploading the primary image node
     private async Task HandleMainImageUpload(InputFileChangeEventArgs e)
     {
         try
@@ -47,7 +43,9 @@ public partial class CreateProduct([FromKeyedServices(BookshopBucketName)] IS3Se
 
             await file.OpenReadStream(MaxAllowedFileSize).CopyToAsync(stream, cancellationToken);
 
-            var result = await s3Service.UploadFileAsync(file.Name,stream, 
+            stream.Seek(0, SeekOrigin.Begin);
+
+            var result = await s3Service.UploadFileAsync(file.Name, stream,
                 MimeTypes.GetMimeType(file.Name), cancellationToken);
 
             if (result.IsSuccess)
@@ -65,20 +63,20 @@ public partial class CreateProduct([FromKeyedServices(BookshopBucketName)] IS3Se
 
     public void SetPreviewActive(string? url)
     {
-        if (!string.IsNullOrWhiteSpace(url))
+        if (string.IsNullOrWhiteSpace(url)) return;
-        {
+
-            ActivePreviewUrl = url;
+        ActivePreviewUrl = url;
-            StateHasChanged();
+
-        }
+        StateHasChanged();
     }
 
     public void ClosePreviewDrawer()
     {
         ActivePreviewUrl = null;
+
         StateHasChanged();
     }
 
-    // Handles uploading a thumbnail image into its specific slot index
     private async Task HandleThumbnailUpload(InputFileChangeEventArgs e, int index)
     {
         try
@@ -91,6 +89,8 @@ public partial class CreateProduct([FromKeyedServices(BookshopBucketName)] IS3Se
 
             await file.OpenReadStream(MaxAllowedFileSize, cancellationToken).CopyToAsync(stream, cancellationToken);
 
+            stream.Seek(0, SeekOrigin.Begin);
+
             var result = await s3Service.UploadFileAsync(file.Name, stream,
                 MimeTypes.GetMimeType(file.Name), cancellationToken);
 
@@ -107,25 +107,42 @@ public partial class CreateProduct([FromKeyedServices(BookshopBucketName)] IS3Se
         }
     }
 
-    public void ClearMainImage()
+    public async Task ClearMainImage()
     {
-        if (ActivePreviewUrl == ProductModel.ImageUrl)
+        if (string.IsNullOrEmpty(ProductModel.ImageUrl)) return;
-        {
+
-            ActivePreviewUrl = null;
+        var targetUrl = ProductModel.ImageUrl;
-        }
+
+        if (ActivePreviewUrl == targetUrl) ActivePreviewUrl = null;
+
         ProductModel.ImageUrl = null;
+
+        StateHasChanged();
+
+        var result = await s3Service.DeleteFileAsync(GetFileKeyFromUrl(targetUrl));
+
+        if (!result.IsSuccess)
+            Console.WriteLine($"[S3 Orphan Cleanup Failure]: {result.Errors[0].Message}");
     }
 
-    public void RemoveThumbnailAt(int index)
+    public async Task RemoveThumbnailAt(int index)
     {
-        if (index >= 0 && index < ProductModel.Thumbnails.Count)
+        if (index < 0 || index >= ProductModel.Thumbnails.Count) return;
-        {
+
-            if (ActivePreviewUrl == ProductModel.Thumbnails[index])
+        var targetUrl = ProductModel.Thumbnails[index];
-            {
+
-                ActivePreviewUrl = null;
+        if (string.IsNullOrEmpty(targetUrl)) return;
-            }
+
-            ProductModel.Thumbnails[index] = string.Empty;
+        if (ActivePreviewUrl == targetUrl) ActivePreviewUrl = null;
-        }
+
+        ProductModel.Thumbnails[index] = string.Empty;
+
+        StateHasChanged();
+
+        var result = await s3Service.DeleteFileAsync(GetFileKeyFromUrl(targetUrl));
+
+        if (result.IsFailed)
+            Console.WriteLine($"[S3 Thumbnail Cleanup Failure]: {result.Errors[0].Message}");
     }
 }
 

ShopAdmin/ShopAdmin.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.39.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.40.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="10.0.8" />
     <PackageReference Include="Polly" Version="8.6.6" />
   </ItemGroup>
@@ -59,6 +59,8 @@
   <!-- Shared Global Usings -->
   <ItemGroup>
     <Using Include="MimeKit" />
+    <Using Include="System.ComponentModel.DataAnnotations" />
+    <Using Include="Microsoft.AspNetCore.Components.Forms" />
     <Using Include="Microsoft.AspNetCore.Components.QuickGrid" />
     <Using Include="Microsoft.AspNetCore.HttpOverrides" />
     <Using Include="Microsoft.AspNetCore.Authentication" />

litecharms-shopadmin-uat.yml

@@ -86,14 +86,14 @@ spec:
           env:
             - name: BookshopS3Settings__AccessKey
               valueFrom:
-              secretKeyRef:
+                secretKeyRef:
-                name: shopadmin-secrets
+                  name: shopadmin-secrets
-                key: bookshop-s3-accesskey
+                  key: bookshop-s3-accesskey
             - name: BookshopS3Settings__SecretKey
               valueFrom:
-              secretKeyRef:
+                secretKeyRef:
-                name: shopadmin-secrets
+                  name: shopadmin-secrets
-                key: bookshop-s3-secretkey
+                  key: bookshop-s3-secretkey
             - name: ConnectionStrings__PostgresScheduler
               valueFrom:
                 secretKeyRef: