Develop

Apps.Akeneo/Actions/GeneralActions.cs

@@ -1,18 +1,9 @@
 using Apps.Akeneo.Invocables;
 using Apps.Akeneo.Models.Entities;
-using Apps.Akeneo.Models.Request.Product;
 using Apps.Akeneo.Models.Response;
-using Apps.Akeneo.Models.Response.Product;
-using Blackbird.Applications.Sdk.Common;
 using Blackbird.Applications.Sdk.Common.Actions;
 using Blackbird.Applications.Sdk.Common.Invocation;
-using Blackbird.Applications.SDK.Extensions.FileManagement.Interfaces;
 using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Apps.Akeneo.Actions
 {

Apps.Akeneo/Actions/ProductActions.cs

@@ -1,4 +1,3 @@
-using System.Globalization;
 using System.Net.Mime;
 using Apps.Akeneo.Constants;
 using Apps.Akeneo.HtmlConversion;
@@ -13,11 +12,8 @@
 using Blackbird.Applications.Sdk.Common.Invocation;
 using Blackbird.Applications.SDK.Extensions.FileManagement.Interfaces;
 using Blackbird.Applications.Sdk.Utils.Extensions.Http;
-using Blackbird.Applications.Sdk.Utils.Extensions.String;
-using Blackbird.Applications.Sdk.Utils.Extensions.System;
 using RestSharp;
 using Apps.Akeneo.Models.Queries;
-using Newtonsoft.Json;
 
 namespace Apps.Akeneo.Actions;
 
@@ -85,21 +81,23 @@ public async Task<FileModel> GetProductHtml([ActionParameter] ProductRequest inp
         var htmlStream = ProductHtmlConverter.ToHtml(product, locale.Locale);
         return new()
         {
-            File = await _fileManagementClient.UploadAsync(htmlStream, MediaTypeNames.Text.Html, $"{product.Uuid}.html")
+            File = await _fileManagementClient.UploadAsync(htmlStream, MediaTypeNames.Text.Html, $"{product.Id}.html")
         };
     }
 
-    // TODO: We should embed the ID in the HTMl file so that the product input can become optional
     [Action("Update product from HTML", Description = "Update product content from HTML file")]
-    public async Task UpdateProductHtml([ActionParameter] ProductRequest input,
+    public async Task UpdateProductHtml([ActionParameter] ProductOptionalRequest input,
         [ActionParameter] LocaleRequest locale, [ActionParameter] FileModel file)
     {
         var fileStream = await _fileManagementClient.DownloadAsync(file.File);
-        var product = await GetProductContent(input.ProductId);
+        var htmlDoc = ProductHtmlConverter.LoadHtml(fileStream);
+
+        var productId = input.ProductId ?? ProductHtmlConverter.GetResourceId(htmlDoc);
+        var product = await GetProductContent(productId);
 
-        var updatedProduct = ProductHtmlConverter.UpdateFromHtml(product, locale.Locale, fileStream);
+        var updatedProduct = ProductHtmlConverter.UpdateFromHtml(product, locale.Locale, htmlDoc);
 
-        var request = new RestRequest($"/products-uuid/{input.ProductId}", Method.Patch)
+        var request = new RestRequest($"/products-uuid/{productId}", Method.Patch)
             .WithJsonBody(new UpdateProductRequest(updatedProduct), JsonConfig.Settings);
 
         await Client.ExecuteWithErrorHandling(request);

Apps.Akeneo/Actions/ProductModelActions.cs

@@ -3,17 +3,11 @@
 using Apps.Akeneo.Models.Queries;
 using Apps.Akeneo.Models.Request.Product;
 using Apps.Akeneo.Models.Request;
-using Apps.Akeneo.Models.Response.Product;
 using Blackbird.Applications.Sdk.Common;
 using Blackbird.Applications.Sdk.Common.Actions;
 using Blackbird.Applications.Sdk.Common.Invocation;
 using Blackbird.Applications.SDK.Extensions.FileManagement.Interfaces;
 using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Apps.Akeneo.Models.Request.ProductModel;
 using Apps.Akeneo.Models.Response.ProductModel;
 using Apps.Akeneo.Constants;
@@ -87,21 +81,23 @@ public async Task<FileModel> GetProductModelHtml([ActionParameter] ProductModelR
             var htmlStream = ProductHtmlConverter.ToHtml(productModel, locale.Locale);
             return new()
             {
-                File = await _fileManagementClient.UploadAsync(htmlStream, MediaTypeNames.Text.Html, $"{productModel.Code}.html")
+                File = await _fileManagementClient.UploadAsync(htmlStream, MediaTypeNames.Text.Html, $"{productModel.Id}.html")
             };
         }
 
-        // TODO: We should embed the ID in the HTMl file so that the product input can become optional
         [Action("Update product model from HTML", Description = "Update product model content from HTML file")]
-        public async Task UpdateProductModelHtml([ActionParameter] ProductModelRequest input,
+        public async Task UpdateProductModelHtml([ActionParameter] ProductModelOptionalRequest input,
             [ActionParameter] LocaleRequest locale, [ActionParameter] FileModel file)
         {
             var fileStream = await _fileManagementClient.DownloadAsync(file.File);
-            var productModel = await GetProductModelContent(input.ProductModelCode);
+            var htmlDoc = ProductHtmlConverter.LoadHtml(fileStream);
+
+            var productId = input.ProductModelCode ?? ProductHtmlConverter.GetResourceId(htmlDoc);
+            var productModel = await GetProductModelContent(productId);
 
-            var updatedProduct = ProductHtmlConverter.UpdateFromHtml(productModel, locale.Locale, fileStream);
+            var updatedProduct = ProductHtmlConverter.UpdateFromHtml(productModel, locale.Locale, htmlDoc);
 
-            var request = new RestRequest($"/product-models/{input.ProductModelCode}", Method.Patch)
+            var request = new RestRequest($"/product-models/{productId}", Method.Patch)
                 .WithJsonBody(new UpdateProductModelRequest(updatedProduct), JsonConfig.Settings);
 
             await Client.ExecuteWithErrorHandling(request);

Apps.Akeneo/Apps.Akeneo.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <Product>Akeneo [Beta]</Product>
         <Description>Akaneo’s PIM solution enables you to ingest, normalize, enrich, and centralize product information through enterprise-grade data modeling, governance, and workflows.</Description>
-        <Version>1.0.6</Version>
+        <Version>1.0.7</Version>
         <AssemblyName>Apps.Akeneo</AssemblyName>
     </PropertyGroup>
 

Apps.Akeneo/DataSource/CategoryDataSourceHandler.cs

@@ -4,11 +4,6 @@
 using Blackbird.Applications.Sdk.Common.Dynamic;
 using Blackbird.Applications.Sdk.Common.Invocation;
 using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Apps.Akeneo.DataSource
 {

Apps.Akeneo/DataSource/ProductDataSourceHandler.cs

@@ -26,6 +26,6 @@ public async Task<Dictionary<string, string>> GetDataAsync(DataSourceContext con
         }  
 
         var result = await Client.PaginateOnce<ProductContentEntity>(request);
-        return result.ToDictionary(x => x.Uuid, x => x.Values["name"].First(x => x.Locale == "en_US").Data.ToString() ?? "No label for en_US");
+        return result.ToDictionary(x => x.Id, x => x.Values["name"].First(x => x.Locale == "en_US").Data.ToString() ?? "No label for en_US");
     }
 }

Apps.Akeneo/DataSource/ProductModelDataSourceHandler.cs

@@ -4,11 +4,6 @@
 using Blackbird.Applications.Sdk.Common.Dynamic;
 using Blackbird.Applications.Sdk.Common.Invocation;
 using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Apps.Akeneo.DataSource
 {
@@ -31,7 +26,7 @@ public async Task<Dictionary<string, string>> GetDataAsync(DataSourceContext con
             }
 
             var result = await Client.PaginateOnce<ProductModelEntity>(request);
-            return result.ToDictionary(x => x.Code, x => x.Code);
+            return result.ToDictionary(x => x.Id, x => x.Id);
         }
     }
 }

Apps.Akeneo/HtmlConversion/HtmlConstants.cs

@@ -9,4 +9,10 @@ public class HtmlConstants
     public const string Paragraph = "p";
     public const string Span = "span";
     public const string H1 = "h1";
+    public const string Ul = "ul";
+    public const string Li = "li";
+    public const string Table = "table";
+    public const string Td = "td";
+    public const string Th = "th";
+    public const string Tr = "tr";
 }