Fixes for static analysis, removing debugging

Author: RyanBirtch-aot

app/src/forms/email/assets/bodies/submission-package.html

@@ -1,16 +1,18 @@
 <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
   <tr>
-    <td data-slot-container="1" align="center" style="font-size: 0px; padding: 10px 25px; word-break: break-word">
-      <div data-slot="text" style="color: #777777; font-family: Oxygen, Helvetica neue, sans-serif; font-size: 14px; line-height: 21px; text-align: left">
+    <td data-slot-container="1" align="center" style="font-size: 0px; padding: 10px 25px; overflow-wrap: break-word">
+      <div data-slot="text" style="color: #777777; font-family: Oxygen, 'Helvetica Neue', sans-serif; font-size: 14px; line-height: 21px; text-align: left">
         <span style="font-size: 12pt; color: #595959">Confirmation Number:</span>
         <b>
           <span style="font-size: 12pt; color: #595959">{{ confirmationNumber }}</span>
         </b>
+
         <p>
           <span style="font-size: 12pt; color: #595959">{{ messageLinkText }}</span>
         </p>
+
         <p>
-          <a href="{{ submissionPackageUrl }}"> Download Submission Package </a>
+          <a href="{{ submissionPackageUrl }}" target="_blank" rel="noopener"> Download Submission Package </a>
         </p>
       </div>
     </td>

app/src/forms/email/emailService.js

@@ -25,7 +25,7 @@ const _replaceHandlebars = (format, context) => {
 };
 
 /** Helper function used to build the email template based on email type and contents */
-const buildEmailTemplate = async (formId, formSubmissionId, emailType, referer, additionalProperties = 0, currentUser) => {
+const buildEmailTemplate = async (formId, formSubmissionId, emailType, referer, currentUser, additionalProperties = 0) => {
   const form = await formService.readForm(formId);
   const submission = await formService.readSubmission(formSubmissionId);
 
@@ -404,7 +404,7 @@ const service = {
    */
   submissionReceived: async (formId, submissionId, body, referer, currentUser) => {
     try {
-      const { configData, contexts } = await buildEmailTemplate(formId, submissionId, EmailTypes.SUBMISSION_RECEIVED, referer, { body }, currentUser);
+      const { configData, contexts } = await buildEmailTemplate(formId, submissionId, EmailTypes.SUBMISSION_RECEIVED, referer, currentUser, { body });
       if (contexts[0].to.length) {
         return service._sendEmailTemplate(configData, contexts);
       } else {

app/src/forms/email/packageService.js

@@ -10,9 +10,9 @@ const storageService = require('../file/storage/storageService');
 const { chefsTemplate } = require('../common/utils');
 const uuid = require('uuid');
 
-const fs = require('fs/promises');
-const os = require('os');
-const path = require('path');
+const fs = require('node:fs/promises');
+const os = require('node:os');
+const path = require('node:path');
 
 const streamToBuffer = async (stream) =>
   new Promise((resolve, reject) => {
@@ -70,11 +70,7 @@ const service = {
    * Render the configured document template for a submission.
    */
   renderSubmissionTemplate: async ({ form, submission, documentTemplateId, convertTo = 'pdf', body = {} }) => {
-    console.log('renderSubTemplate Submision');
-    console.log(submission);
-    console.log('rendering submission with cdogs');
     const template = await documentTemplateService.documentTemplateRead(documentTemplateId);
-    console.log('template' + template);
     const fileName = template.filename.substring(0, template.filename.lastIndexOf('.'));
 
     const fileExtension = template.filename.substring(template.filename.lastIndexOf('.') + 1);
@@ -83,8 +79,6 @@ const service = {
     const submissionFormVersion = form.versions.find((v) => v.id === submission.formVersionId)?.version;
 
     const cdogsSubData = chefsTemplate({ version: submissionFormVersion, submission });
-    console.log('cdogssub Data');
-    console.log(cdogsSubData);
 
     const templateBody = {
       ...body,
@@ -151,7 +145,6 @@ const service = {
    *  - all uploaded submission files
    */
   buildSubmissionPackage: async ({ form, submission, convertTo = 'pdf' }) => {
-    console.log(form);
     if (!form.submissionCompletionTemplateId) {
       throw new Error('No submissionCompletionTemplateId configured on form.');
     }
@@ -240,8 +233,7 @@ const service = {
         fileCount: zip.fileCount,
       };
     } finally {
-      console.log('Leaving temp zip for inspection' + tempPath);
-      // await fs.rm(tempPath, { force: true });
+      await fs.rm(tempPath, { force: true });
     }
   },
 };