From 36e2b0f9cc6118d0140d5b01df0a41c402153901 Mon Sep 17 00:00:00 2001
From: Dan Gowans <dangowans@users.noreply.github.com>
Date: Thu, 24 Apr 2025 13:48:19 -0400
Subject: [PATCH] linting

---
 .../doDeleteWorkOrderBurialSite.d.ts              |  2 +-
 .../doDeleteWorkOrderBurialSite.ts                |  3 ++-
 .../workOrders-post/doDeleteWorkOrderComment.d.ts |  5 ++++-
 .../workOrders-post/doDeleteWorkOrderComment.ts   | 15 ++++++++++-----
 .../doDeleteWorkOrderContract.d.ts                |  2 +-
 .../workOrders-post/doDeleteWorkOrderContract.js  |  2 +-
 .../workOrders-post/doDeleteWorkOrderContract.ts  |  5 +++--
 .../doDeleteWorkOrderMilestone.d.ts               |  5 ++++-
 .../workOrders-post/doDeleteWorkOrderMilestone.ts | 10 +++++++---
 handlers/workOrders-post/doReopenWorkOrder.d.ts   |  4 +++-
 handlers/workOrders-post/doReopenWorkOrder.ts     |  7 +++++--
 .../doReopenWorkOrderMilestone.d.ts               |  5 ++++-
 .../workOrders-post/doReopenWorkOrderMilestone.ts | 10 +++++++---
 helpers/functions.cache.ts                        |  1 +
 public/javascripts/contract.editFees.js           |  4 ++--
 public/javascripts/contract.editFees.ts           |  5 +++--
 16 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts
index 9dd14bea..1034f3b4 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts
@@ -1,5 +1,5 @@
 import type { Request, Response } from 'express';
 export default function handler(request: Request<unknown, unknown, {
-    workOrderId: string;
     burialSiteId: string;
+    workOrderId: string;
 }>, response: Response): void;
diff --git a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts
index 3e4de549..0dbd31ec 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts
@@ -7,7 +7,7 @@ export default function handler(
   request: Request<
     unknown,
     unknown,
-    { workOrderId: string; burialSiteId: string }
+    { burialSiteId: string; workOrderId: string }
   >,
   response: Response
 ): void {
@@ -24,6 +24,7 @@ export default function handler(
     {
       limit: -1,
       offset: 0,
+
       includeContractCount: false
     }
   )
diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts
index d5e48cba..bc70e59f 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts
@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): void;
+export default function handler(request: Request<unknown, unknown, {
+    workOrderCommentId: string;
+    workOrderId: string;
+}>, response: Response): void;
diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.ts
index 58a3db1b..4ad50b99 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderComment.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderComment.ts
@@ -3,16 +3,21 @@ import type { Request, Response } from 'express'
 import { deleteRecord } from '../../database/deleteRecord.js'
 import getWorkOrderComments from '../../database/getWorkOrderComments.js'
 
-export default function handler(request: Request, response: Response): void {
+export default function handler(
+  request: Request<
+    unknown,
+    unknown,
+    { workOrderCommentId: string; workOrderId: string }
+  >,
+  response: Response
+): void {
   const success = deleteRecord(
     'WorkOrderComments',
-    request.body.workOrderCommentId as string,
+    request.body.workOrderCommentId,
     request.session.user as User
   )
 
-  const workOrderComments = getWorkOrderComments(
-    request.body.workOrderId as string
-  )
+  const workOrderComments = getWorkOrderComments(request.body.workOrderId)
 
   response.json({
     success,
diff --git a/handlers/workOrders-post/doDeleteWorkOrderContract.d.ts b/handlers/workOrders-post/doDeleteWorkOrderContract.d.ts
index d4427103..e885d37e 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderContract.d.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderContract.d.ts
@@ -1,5 +1,5 @@
 import type { Request, Response } from 'express';
 export default function handler(request: Request<unknown, unknown, {
-    workOrderId: string;
     contractId: string;
+    workOrderId: string;
 }>, response: Response): Promise<void>;
diff --git a/handlers/workOrders-post/doDeleteWorkOrderContract.js b/handlers/workOrders-post/doDeleteWorkOrderContract.js
index 79153131..b8c27b5d 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderContract.js
+++ b/handlers/workOrders-post/doDeleteWorkOrderContract.js
@@ -7,8 +7,8 @@ export default async function handler(request, response) {
     }, {
         limit: -1,
         offset: 0,
-        includeInterments: true,
         includeFees: false,
+        includeInterments: true,
         includeTransactions: false
     });
     response.json({
diff --git a/handlers/workOrders-post/doDeleteWorkOrderContract.ts b/handlers/workOrders-post/doDeleteWorkOrderContract.ts
index f4cf43bf..5efd739e 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderContract.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderContract.ts
@@ -7,7 +7,7 @@ export default async function handler(
   request: Request<
     unknown,
     unknown,
-    { workOrderId: string; contractId: string }
+    { contractId: string; workOrderId: string }
   >,
   response: Response
 ): Promise<void> {
@@ -24,8 +24,9 @@ export default async function handler(
     {
       limit: -1,
       offset: 0,
-      includeInterments: true,
+
       includeFees: false,
+      includeInterments: true,
       includeTransactions: false
     }
   )
diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts
index 19d32e4d..28337bff 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts
@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    workOrderId: string;
+    workOrderMilestoneId: string;
+}>, response: Response): Promise<void>;
diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts
index 5aeb6f11..18faa32a 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts
@@ -4,18 +4,22 @@ import { deleteRecord } from '../../database/deleteRecord.js'
 import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { workOrderId: string; workOrderMilestoneId: string }
+  >,
   response: Response
 ): Promise<void> {
   const success = deleteRecord(
     'WorkOrderMilestones',
-    request.body.workOrderMilestoneId as string,
+    request.body.workOrderMilestoneId,
     request.session.user as User
   )
 
   const workOrderMilestones = await getWorkOrderMilestones(
     {
-      workOrderId: request.body.workOrderId as string
+      workOrderId: request.body.workOrderId
     },
     {
       orderBy: 'completion'
diff --git a/handlers/workOrders-post/doReopenWorkOrder.d.ts b/handlers/workOrders-post/doReopenWorkOrder.d.ts
index d5e48cba..9b255c23 100644
--- a/handlers/workOrders-post/doReopenWorkOrder.d.ts
+++ b/handlers/workOrders-post/doReopenWorkOrder.d.ts
@@ -1,2 +1,4 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): void;
+export default function handler(request: Request<unknown, unknown, {
+    workOrderId: string;
+}>, response: Response): void;
diff --git a/handlers/workOrders-post/doReopenWorkOrder.ts b/handlers/workOrders-post/doReopenWorkOrder.ts
index f025c7a5..c78504ba 100644
--- a/handlers/workOrders-post/doReopenWorkOrder.ts
+++ b/handlers/workOrders-post/doReopenWorkOrder.ts
@@ -2,7 +2,10 @@ import type { Request, Response } from 'express'
 
 import reopenWorkOrder from '../../database/reopenWorkOrder.js'
 
-export default function handler(request: Request, response: Response): void {
+export default function handler(
+  request: Request<unknown, unknown, { workOrderId: string }>,
+  response: Response
+): void {
   const success = reopenWorkOrder(
     request.body.workOrderId as string,
     request.session.user as User
@@ -10,6 +13,6 @@ export default function handler(request: Request, response: Response): void {
 
   response.json({
     success,
-    workOrderId: request.body.workOrderId as string
+    workOrderId: request.body.workOrderId
   })
 }
diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts
index 19d32e4d..28337bff 100644
--- a/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts
+++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts
@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    workOrderId: string;
+    workOrderMilestoneId: string;
+}>, response: Response): Promise<void>;
diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts
index 1ad345cc..a1553144 100644
--- a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts
+++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts
@@ -4,17 +4,21 @@ import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'
 import reopenWorkOrderMilestone from '../../database/reopenWorkOrderMilestone.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { workOrderId: string; workOrderMilestoneId: string }
+  >,
   response: Response
 ): Promise<void> {
   const success = reopenWorkOrderMilestone(
-    request.body.workOrderMilestoneId as string,
+    request.body.workOrderMilestoneId,
     request.session.user as User
   )
 
   const workOrderMilestones = await getWorkOrderMilestones(
     {
-      workOrderId: request.body.workOrderId as string
+      workOrderId: request.body.workOrderId
     },
     {
       orderBy: 'completion'
diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts
index 0c682f7a..e62c722b 100644
--- a/helpers/functions.cache.ts
+++ b/helpers/functions.cache.ts
@@ -372,6 +372,7 @@ export function clearCacheByTableName(
         messageType: 'clearCache',
         tableName,
         timeMillis: Date.now(),
+
         pid: process.pid
       }
 
diff --git a/public/javascripts/contract.editFees.js b/public/javascripts/contract.editFees.js
index 0644afee..8da3f8de 100644
--- a/public/javascripts/contract.editFees.js
+++ b/public/javascripts/contract.editFees.js
@@ -96,7 +96,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
     function renderContractFees() {
         if (contractFees.length === 0) {
             contractFeesContainerElement.innerHTML = `<div class="message is-info">
-        <p class="message-body">There are no fees associated with this record.</p>
+        <p class="message-body">There are no fees associated with this contract.</p>
         </div>`;
             renderContractTransactions();
             return;
@@ -468,7 +468,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
         if (contractTransactions.length === 0) {
             // eslint-disable-next-line no-unsanitized/property
             contractTransactionsContainerElement.innerHTML = `<div class="message ${contractFees.length === 0 ? 'is-info' : 'is-warning'}">
-          <p class="message-body">There are no transactions associated with this record.</p>
+          <p class="message-body">There are no transactions associated with this contract.</p>
           </div>`;
             return;
         }
diff --git a/public/javascripts/contract.editFees.ts b/public/javascripts/contract.editFees.ts
index bd2fd221..8af51111 100644
--- a/public/javascripts/contract.editFees.ts
+++ b/public/javascripts/contract.editFees.ts
@@ -120,6 +120,7 @@ declare const exports: Record<string, unknown>
           .querySelector('form')
           ?.addEventListener('submit', doUpdateQuantity)
       },
+
       onremoved() {
         bulmaJS.toggleHtmlClipped()
       }
@@ -176,7 +177,7 @@ declare const exports: Record<string, unknown>
   function renderContractFees(): void {
     if (contractFees.length === 0) {
       contractFeesContainerElement.innerHTML = `<div class="message is-info">
-        <p class="message-body">There are no fees associated with this record.</p>
+        <p class="message-body">There are no fees associated with this contract.</p>
         </div>`
 
       renderContractTransactions()
@@ -754,7 +755,7 @@ declare const exports: Record<string, unknown>
     if (contractTransactions.length === 0) {
       // eslint-disable-next-line no-unsanitized/property
       contractTransactionsContainerElement.innerHTML = `<div class="message ${contractFees.length === 0 ? 'is-info' : 'is-warning'}">
-          <p class="message-body">There are no transactions associated with this record.</p>
+          <p class="message-body">There are no transactions associated with this contract.</p>
           </div>`
 
       return