From 78f4600983fba52f9a0777851bb0d9517e3a7af3 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 21 Jan 2025 12:14:16 +0200 Subject: [PATCH 1/3] Pass language prop to footer template for fw mode --- workers/loc.api/generate-report-file/pdf-writer/index.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/workers/loc.api/generate-report-file/pdf-writer/index.js b/workers/loc.api/generate-report-file/pdf-writer/index.js index 7b062ed1..c0f79b5e 100644 --- a/workers/loc.api/generate-report-file/pdf-writer/index.js +++ b/workers/loc.api/generate-report-file/pdf-writer/index.js @@ -101,7 +101,10 @@ class PdfWriter { apiData, opts ) - const buffer = await this.createPDFBuffer({ template }) + const buffer = await this.createPDFBuffer({ + template, + language: opts?.language + }) return buffer } @@ -192,7 +195,7 @@ class PdfWriter { return html } - #getTranslator (language) { + getTranslator (language) { return getTranslator( { i18next: this.i18next }, { @@ -248,7 +251,7 @@ class PdfWriter { const languages = this.#getAvailableLanguages() for (const language of languages) { - const translate = this.#getTranslator(language) + const translate = this.getTranslator(language) for (const [templateFileName, templatePath] of this.#templatePaths) { const fn = pug.compileFile(templatePath, { From 14842d8d3ff2bd6d5fd24ea4c1adb008b52cfe3b Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 21 Jan 2025 12:15:21 +0200 Subject: [PATCH 2/3] Add shouldZoomBeAdjusted flag to base template --- workers/loc.api/generate-report-file/pdf-writer/index.js | 6 +++++- .../generate-report-file/pdf-writer/templates/base.pug | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/workers/loc.api/generate-report-file/pdf-writer/index.js b/workers/loc.api/generate-report-file/pdf-writer/index.js index c0f79b5e..51e6047e 100644 --- a/workers/loc.api/generate-report-file/pdf-writer/index.js +++ b/workers/loc.api/generate-report-file/pdf-writer/index.js @@ -52,6 +52,10 @@ class PdfWriter { this.i18next = i18next this.isElectronjsEnv = false + this.shouldZoomBeAdjusted = ( + process.platform !== 'win32' && + !this.isElectronjsEnv + ) this.addTemplates() this.compileTemplate() @@ -174,7 +178,7 @@ class PdfWriter { const reportColumns = jobData?.columnsPdf ?? jobData?.columnsCsv const html = template({ - isElectronjsEnv: this.isElectronjsEnv, + shouldZoomBeAdjusted: this.shouldZoomBeAdjusted, apiData, jobData, reportColumns, diff --git a/workers/loc.api/generate-report-file/pdf-writer/templates/base.pug b/workers/loc.api/generate-report-file/pdf-writer/templates/base.pug index 9facf308..6ed79b15 100644 --- a/workers/loc.api/generate-report-file/pdf-writer/templates/base.pug +++ b/workers/loc.api/generate-report-file/pdf-writer/templates/base.pug @@ -13,7 +13,7 @@ html(lang=language) //- https://github.com/marcbachmann/node-html-pdf/issues/619 //- https://github.com/marcbachmann/node-html-pdf/issues/525 //- ratio for rendering: 72dpi (pdf) / 96dpi (browser), 72/96 = 0.75 - if process.platform !== 'win32' && !isElectronjsEnv + if shouldZoomBeAdjusted style @media print { html { zoom: 0.75; } } style @media print { .header, .footer { zoom: 1; } } else From 72803d218f42c43259b82364126c9fff916eba63 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 22 Jan 2025 11:07:26 +0200 Subject: [PATCH 3/3] Update nodejs up to 20.18.1 under gh actions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62679648..4db68d60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive - uses: actions/setup-node@v4 with: - node-version: 18.17.1 + node-version: 20.18.1 - name: Setup configs run: | cp config/common.json.example config/common.json \