From 0a4d54a15007fbcf1e1581726a7841a37ae4cca9 Mon Sep 17 00:00:00 2001
From: Dan Gowans <dangowans@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:55:47 -0400
Subject: [PATCH] fix ordering, remove parameters

---
 handlers/print-get/pdf.d.ts |  2 +-
 handlers/print-get/pdf.js   |  5 +----
 handlers/print-get/pdf.ts   | 24 ++++++++----------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/handlers/print-get/pdf.d.ts b/handlers/print-get/pdf.d.ts
index e708bdbe..57b7a29b 100644
--- a/handlers/print-get/pdf.d.ts
+++ b/handlers/print-get/pdf.d.ts
@@ -1,4 +1,4 @@
 /// <reference types="cookie-parser" />
-import type { Request, Response, NextFunction } from 'express';
+import type { NextFunction, Request, Response } from 'express';
 export declare function handler(request: Request, response: Response, next: NextFunction): Promise<void>;
 export default handler;
diff --git a/handlers/print-get/pdf.js b/handlers/print-get/pdf.js
index 4b0b6f2e..e288c677 100644
--- a/handlers/print-get/pdf.js
+++ b/handlers/print-get/pdf.js
@@ -5,7 +5,7 @@ import camelcase from 'camelcase';
 import * as ejs from 'ejs';
 import * as configFunctions from '../../helpers/functions.config.js';
 import * as lotOccupancyFunctions from '../../helpers/functions.lotOccupancy.js';
-import { getReportData, getPdfPrintConfig } from '../../helpers/functions.print.js';
+import { getPdfPrintConfig, getReportData } from '../../helpers/functions.print.js';
 const attachmentOrInline = configFunctions.getProperty('settings.printPdf.contentDisposition');
 export async function handler(request, response, next) {
     const printName = request.params.printName;
@@ -40,9 +40,6 @@ export async function handler(request, response, next) {
             format: 'letter',
             printBackground: true,
             preferCSSPageSize: true
-        }, undefined, {
-            cacheBrowser: true,
-            remoteContent: false
         });
         pdfCallbackFunction(pdf);
     }
diff --git a/handlers/print-get/pdf.ts b/handlers/print-get/pdf.ts
index 89cf4555..4cc03d10 100644
--- a/handlers/print-get/pdf.ts
+++ b/handlers/print-get/pdf.ts
@@ -4,13 +4,13 @@ import { convertHTMLToPDF } from '@cityssm/pdf-puppeteer'
 import * as dateTimeFunctions from '@cityssm/utils-datetime'
 import camelcase from 'camelcase'
 import * as ejs from 'ejs'
-import type { Request, Response, NextFunction } from 'express'
+import type { NextFunction, Request, Response } from 'express'
 
 import * as configFunctions from '../../helpers/functions.config.js'
 import * as lotOccupancyFunctions from '../../helpers/functions.lotOccupancy.js'
 import {
-  getReportData,
-  getPdfPrintConfig
+  getPdfPrintConfig,
+  getReportData
 } from '../../helpers/functions.print.js'
 
 const attachmentOrInline = configFunctions.getProperty(
@@ -74,19 +74,11 @@ export async function handler(
       return
     }
 
-    const pdf = await convertHTMLToPDF(
-      ejsData,
-      {
-        format: 'letter',
-        printBackground: true,
-        preferCSSPageSize: true
-      },
-      undefined,
-      {
-        cacheBrowser: true,
-        remoteContent: false
-      }
-    )
+    const pdf = await convertHTMLToPDF(ejsData, {
+      format: 'letter',
+      printBackground: true,
+      preferCSSPageSize: true
+    })
 
     pdfCallbackFunction(pdf)
   }