Merge pull request ALCOpenSource#195 from Honeyloveet/fix/backend-not…

…-working Fixed backend not running on linux and mac
tamsay · Jun 20, 2023 · 757522f · 757522f
2 parents 1b2c0d7 + 0f09423
commit 757522f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 135 deletions.
diff --git a/backend/src/mms.Application/Report/Command/DownloadReportCommand.cs b/backend/src/mms.Application/Report/Command/DownloadReportCommand.cs
diff --git a/backend/src/mms.Application/Report/Command/DownloadReportCommandHandler.cs b/backend/src/mms.Application/Report/Command/DownloadReportCommandHandler.cs
diff --git a/backend/src/mms.api/Controllers/ReportController.cs b/backend/src/mms.api/Controllers/ReportController.cs
@@ -94,14 +94,6 @@ public async Task<IActionResult> GetReportById(string id)
  return Ok(result);
  }
 
- [HttpGet("downloadReport/{reportId}")]
- public async Task<IActionResult> GetDownloadPdf(string reportId)
- {
- var result = await Mediator.Send(new DownloadReportCommand { Id = reportId });
- return File(result,"application/octet-stream", "report.pdf");
- }
-
-
  [HttpPost("report")]
  public async Task<IActionResult> CreateTask(CreateReportCommand command)
  {

diff --git a/backend/src/mms.api/Program.cs b/backend/src/mms.api/Program.cs
@@ -1,5 +1,3 @@
-using DinkToPdf.Contracts;
-using DinkToPdf;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using mms.api.Configurations;
@@ -10,8 +8,6 @@
 using mms.Infrastructure;
 using mms.Infrastructure.Context;
 using mms.Infrastructure.Seeder;
-using mms.Application.Report.Command;
-using System.IO;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -24,10 +20,6 @@
 builder.Logging.AddConsole();
 
 // Add services to the container.
-CustomAssemblyLoadContext context = new CustomAssemblyLoadContext();
-context.LoadUnmanagedLibrary(Path.Combine(Directory.GetCurrentDirectory(), "libraries/libwkhtmltox.dll"));
-builder.Services.AddSingleton(typeof(IConverter),
- new SynchronizedConverter(new PdfTools()));
 builder.Services.AddControllers();
 builder.Services.AddSignalR();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle

diff --git a/backend/src/mms.api/libraries/libwkhtmltox.dll b/backend/src/mms.api/libraries/libwkhtmltox.dll
diff --git a/backend/src/mms.api/libraries/libwkhtmltox.dylib b/backend/src/mms.api/libraries/libwkhtmltox.dylib
diff --git a/backend/src/mms.api/libraries/libwkhtmltox.so b/backend/src/mms.api/libraries/libwkhtmltox.so
diff --git a/frontend/mms-Admin/package-lock.json b/frontend/mms-Admin/package-lock.json
diff --git a/frontend/mms-Admin/yarn.lock b/frontend/mms-Admin/yarn.lock
@@ -3969,7 +3969,7 @@ postcss-value-parser@^4.0.2:
  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.21:
+postcss@^8.4.23:
  version "8.4.23"
  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz"
  integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
@@ -4332,10 +4332,10 @@ rimraf@^3.0.2:
  dependencies:
  glob "^7.1.3"
 
-rollup@^1.20.0||^2.0.0||^3.0.0, rollup@^3.20.2:
- version "3.20.7"
- resolved "https://registry.npmjs.org/rollup/-/rollup-3.20.7.tgz"
- integrity sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA==
+rollup@^1.20.0||^2.0.0||^3.0.0, rollup@^3.21.0:
+ version "3.25.1"
+ resolved "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz"
+ integrity sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==
  optionalDependencies:
  fsevents "~2.3.2"
 
@@ -4881,13 +4881,13 @@ vite-plugin-svgr@^2.4.0:
  "@svgr/core" "^6.5.1"
 
 "vite@^2.6.0 || 3 || 4", vite@^4.1.0-beta.0, vite@^4.2.0:
- version "4.3.1"
- resolved "https://registry.npmjs.org/vite/-/vite-4.3.1.tgz"
- integrity sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==
+ version "4.3.9"
+ resolved "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"
+ integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==
  dependencies:
  esbuild "^0.17.5"
- postcss "^8.4.21"
- rollup "^3.20.2"
+ postcss "^8.4.23"
+ rollup "^3.21.0"
  optionalDependencies:
  fsevents "~2.3.2"