Refactoring code

BlackRock.Reporting.API/Controllers/PDFGeneratorController.cs

@@ -1,23 +1,24 @@
 using System.Web;
+using BlackRock.Reporting.API.Core;
 using Microsoft.AspNetCore.Mvc;
-using PuppeteerSharp;
 
 namespace BlackRock.Reporting.API.Controllers
 {
     [Route("api/[controller]")]
-    public class PDFGeneratorController: Controller
+    public class PDFGeneratorController : Controller
     {
         private readonly IHostEnvironment host;
+        private readonly IGenerator generator;
 
-        public PDFGeneratorController(IHostEnvironment host)
+        public PDFGeneratorController(IHostEnvironment host, IGenerator generator)
         {
+            this.generator = generator;
             this.host = host;
         }
-        // Pristize URL adresa izvora web stranice koju treba eksportovati u PDF fajl
+        
         [HttpGet("{url}")]
-        public async Task<IActionResult> Get(string url= "http://localhost:3000/#/dashboard")
+        public async Task<IActionResult> Get(string url = "http://localhost:3000/#/dashboard")
         {
-//          Service ima endpint na koji stize zahtev sa urlom strance koju treba eksportovati u PDF
             if (string.IsNullOrEmpty(url))
                 return BadRequest();
 
@@ -26,82 +27,9 @@ namespace BlackRock.Reporting.API.Controllers
             var fileName = Guid.NewGuid().ToString() + ".pdf";
             // Path to wwwroot folder combined with name of pdf file
             string path = Path.Combine(host.ContentRootPath, $"wwwroot/pdfs/{fileName}");
-            // string path = Path.Combine(host.WebRootPath, fileName);
-            // Generate PDF file in wwwroot
-//          Service obradjuje zahtev
-//          U pozadini se podize chromium koji cemo koristiti za print
-//          Pupeter otvara stranicu sa zadatim urlom
-//          Pokrece se Engine Modul i priprema za procesiranje strance
-//          Transformacija stranice u print ready stranicu
-//          Daje se instrukija pupeteru da pokrene print nad print ready stranicom
-            await GeneratePdf(result, path);
-            // Prepare PDF file to download
-//          Generisani PDF fails se vraca kao rezultat obrade zahteva
+            await generator.Generate(result, path);
             FileStream stream = new FileStream(path, FileMode.Open);
-            
             return File(stream, "application/pdf", fileName);
         }
-        
-        private async Task GeneratePdf(string url, string path)
-        {
-            await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
-            var options = new LaunchOptions
-            {
-                Headless = true
-            };
-            using (var browser = await Puppeteer.LaunchAsync(options))
-            using (var page = await browser.NewPageAsync())
-            {
-                await page.GoToAsync(url, WaitUntilNavigation.DOMContentLoaded);
-
-
-                var allResultsSelector = ".chartjs-render-monitor";
-                await page.WaitForSelectorAsync(allResultsSelector);
-                await EvaluateScript(page, "dist/main.js");
-                // Transform HTML page before printing in PDF
-                // TODO: Find solution to import some JS library
-                // await page.EvaluateFunctionAsync("() => {document.getElementsByTagName('p')[0].style.display = 'none'}");
-                //await page.EvaluateFunctionAsync("() => metoda()");
-                //await page.ClickAsync("button#prepare");
-                // Ne moze da radi jer Puppeteer ne pristupa skrivenim elementima
-                //await page.ClickAsync("button#modify");
-                // Resenje evaluate JS
-                //await EvaluateScript(page, "transform.js");
-                //string present = await CheckIfTransformExists(page);
-                //// provera da li je transformacija vec odradjena
-                //if (string.IsNullOrEmpty(present))
-                //{
-                //    await EvaluateScript(page, "transform.js");
-                //}
-
-                //await EvaluateScript(page, "modify.js");
-
-                //await page.EvaluateFunctionAsync("() => document.querySelector('#modify').click()");
-                await page.PdfAsync(path, new PdfOptions() { PrintBackground = true, Format = PuppeteerSharp.Media.PaperFormat.Letter });
-
-            }
-        }
-
-        // private async Task<string> CheckIfTransformExists(Page page)
-        // {
-        //     string path4 = Path.Combine(host.WebRootPath, "check.js");
-        //     FileStream fs4 = new FileStream(path4, FileMode.Open);
-        //     StreamReader streamReader4 = new StreamReader(fs4);
-        //     string result4 = "";
-        //     while (!streamReader4.EndOfStream)
-        //     {
-        //         result4 += (streamReader4.ReadLine() + Environment.NewLine);
-        //     }
-        //     fs4.Close();
-        //     var present = await page.EvaluateFunctionAsync<string>(result4);
-        //     return present;
-        // }
-
-        private async Task EvaluateScript(Page page,string fileName)
-        {
-            string path2 = Path.Combine(host.ContentRootPath, fileName);
-            var result = await System.IO.File.ReadAllTextAsync(path2);
-            await page.EvaluateExpressionAsync(result);
-        }
     }
 }

BlackRock.Reporting.API/Core/IGenerator.cs

@@ -0,0 +1,7 @@
+namespace BlackRock.Reporting.API.Core
+{
+    public interface IGenerator
+    {
+         Task Generate(string url, string path);
+    }
+}

BlackRock.Reporting.API/Core/IPdfGenerator.cs

@@ -0,0 +1,7 @@
+namespace BlackRock.Reporting.API.Core
+{
+    public interface IPdfGenerator : IGenerator
+    {
+         
+    }
+}

BlackRock.Reporting.API/PDFEngineJQuery.js

@@ -0,0 +1,28 @@
+import $ from 'jquery';
+
+const initialize = () => {
+    document.getElementsByTagName('canvas').forEach(element => element.setAttribute('map','map1'));
+    document.getElementsByClassName("col-sm-6").forEach(e => e.setAttribute("mapiranje", "map1"));
+    const paragraf = document.createElement('p');
+    paragraf.innerHTML = "hajde radi opet";
+    document.querySelector('body').appendChild(paragraf);
+}
+const transform = () => {
+    $("canvas[map='map1']").css({'display':'none'});
+    // document.querySelectorAll('[map="map1"]')[1].style.display = "none";
+    // let maliDivovi = document.querySelectorAll('[mapiranje="map1"]');
+    // maliDivovi.forEach(el => { el.className = "col-sm-12" });
+    // let p = document.createElement('p');
+    // p.innerHTML = 'mozda radi';
+    // document.querySelector('body').appendChild(p);
+    // document.querySelector('body').style.backgroundColor = 'red';
+}
+
+
+const PDFEngineJQuery = () =>
+{
+    initialize();
+    transform();
+}
+
+export default PDFEngineJQuery;

BlackRock.Reporting.API/Persistence/PdfGenerator.cs

@@ -0,0 +1,48 @@
+using BlackRock.Reporting.API.Core;
+using PuppeteerSharp;
+
+namespace BlackRock.Reporting.API.Persistence
+{
+    public class PdfGenerator : IPdfGenerator
+    {
+        private readonly IHostEnvironment host;
+        public PdfGenerator(IHostEnvironment host)
+        {
+            this.host = host;
+
+        }
+        public async Task Generate(string url, string path)
+        {
+            await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
+            var options = new LaunchOptions
+            {
+                Headless = true
+            };
+            using (var browser = await Puppeteer.LaunchAsync(options))
+            using (var page = await browser.NewPageAsync())
+            {
+                await page.GoToAsync(url, WaitUntilNavigation.DOMContentLoaded);
+
+
+                var allResultsSelector = ".chartjs-render-monitor";
+                await page.WaitForSelectorAsync(allResultsSelector);
+                await EvaluateScript(page, "dist/main.js");
+                
+                await page.PdfAsync(path, new PdfOptions()
+                {
+                    PrintBackground = true,
+                    Format = PuppeteerSharp.Media.PaperFormat.Letter,
+                    Scale = 1,
+                    DisplayHeaderFooter = true
+                });
+
+            }
+        }
+        private async Task EvaluateScript(Page page, string fileName)
+        {
+            string path2 = Path.Combine(host.ContentRootPath, fileName);
+            var result = await System.IO.File.ReadAllTextAsync(path2);
+            await page.EvaluateExpressionAsync(result);
+        }
+    }
+}

BlackRock.Reporting.API/Program.cs

@@ -1,10 +1,12 @@
-using Microsoft.OpenApi.Models;
+using BlackRock.Reporting.API.Core;
+using BlackRock.Reporting.API.Persistence;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddCors();
 builder.Services.AddControllers();
+builder.Services.AddScoped<IGenerator,PdfGenerator>();
 builder.Services.AddSwaggerGen(c =>
 {
     c.SwaggerDoc("v1", new() { Title = "BlackRock.Reporting.API", Version = "v1" });

BlackRock.Reporting.API/index.js

@@ -1,5 +1,8 @@
-import PDFEngine from './pdfengine'
+import PDFEngineJQuery from './PDFEngineJQuery';
+// import PDFEngine from './src/PDFEngineJ';
+// import './src/PDFEngine.css';
+
 (() =>
 {    
-    PDFEngine();
+    PDFEngineJQuery();
 })()

BlackRock.Reporting.API/package.json

@@ -15,5 +15,8 @@
     "style-loader": "^3.3.0",
     "webpack": "^5.55.1",
     "webpack-cli": "^4.8.0"
+  },
+  "dependencies": {
+    "jquery": "^3.6.0"
   }
 }