linting

cityssm · Jun 27, 2024 · 84f0090 · 84f0090
1 parent 1ca3ea0
commit 84f0090
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 113 deletions.
diff --git a/public-typescript/adminFees.ts b/public-typescript/adminFees.ts
@@ -5,7 +5,12 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js'
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js'
 
 import type { LOS } from '../types/globalTypes.js'
-import type * as recordTypes from '../types/recordTypes.js'
+import type {
+  Fee,
+  FeeCategory,
+  LotType,
+  OccupancyType
+} from '../types/recordTypes.js'
 
 declare const cityssm: cityssmGlobal
 declare const bulmaJS: BulmaJS
@@ -18,13 +23,13 @@ declare const exports: Record<string, unknown>
     '#container--feeCategories'
   ) as HTMLElement
 
-  let feeCategories = exports.feeCategories as recordTypes.FeeCategory[]
+  let feeCategories = exports.feeCategories as FeeCategory[]
   delete exports.feeCategories
 
   type ResponseJSON =
     | {
         success: true
-        feeCategories: recordTypes.FeeCategory[]
+        feeCategories: FeeCategory[]
       }
     | {
         success: false
@@ -305,7 +310,7 @@ declare const exports: Record<string, unknown>
 
     const feeCategory = feeCategories.find((currentFeeCategory) => {
       return currentFeeCategory.feeCategoryId === feeCategoryId
-    }) as recordTypes.FeeCategory
+    }) as FeeCategory
 
     let editCloseModalFunction: () => void
 
@@ -506,7 +511,7 @@ declare const exports: Record<string, unknown>
           '#feeAdd--occupancyTypeId'
         ) as HTMLSelectElement
 
-        for (const occupancyType of exports.occupancyTypes as recordTypes.OccupancyType[]) {
+        for (const occupancyType of exports.occupancyTypes as OccupancyType[]) {
           const optionElement = document.createElement('option')
           optionElement.value = occupancyType.occupancyTypeId.toString()
           optionElement.textContent = occupancyType.occupancyType
@@ -517,7 +522,7 @@ declare const exports: Record<string, unknown>
           '#feeAdd--lotTypeId'
         ) as HTMLSelectElement
 
-        for (const lotType of exports.lotTypes as recordTypes.LotType[]) {
+        for (const lotType of exports.lotTypes as LotType[]) {
           const optionElement = document.createElement('option')
           optionElement.value = lotType.lotTypeId.toString()
           optionElement.textContent = lotType.lotType
@@ -627,11 +632,11 @@ declare const exports: Record<string, unknown>
 
     const feeCategory = feeCategories.find((currentFeeCategory) => {
       return currentFeeCategory.feeCategoryId === feeCategoryId
-    }) as recordTypes.FeeCategory
+    }) as FeeCategory
 
     const fee = feeCategory.fees.find((currentFee) => {
       return currentFee.feeId === feeId
-    }) as recordTypes.Fee
+    }) as Fee
 
     let editCloseModalFunction: () => void
     let editModalElement: HTMLElement
@@ -795,7 +800,7 @@ declare const exports: Record<string, unknown>
           '#feeEdit--occupancyTypeId'
         ) as HTMLSelectElement
 
-        for (const occupancyType of exports.occupancyTypes as recordTypes.OccupancyType[]) {
+        for (const occupancyType of exports.occupancyTypes as OccupancyType[]) {
           const optionElement = document.createElement('option')
           optionElement.value = occupancyType.occupancyTypeId.toString()
           optionElement.textContent = occupancyType.occupancyType
@@ -811,7 +816,7 @@ declare const exports: Record<string, unknown>
           '#feeEdit--lotTypeId'
         ) as HTMLSelectElement
 
-        for (const lotType of exports.lotTypes as recordTypes.LotType[]) {
+        for (const lotType of exports.lotTypes as LotType[]) {
           const optionElement = document.createElement('option')
           optionElement.value = lotType.lotTypeId.toString()
           optionElement.textContent = lotType.lotType

diff --git a/public-typescript/adminLotTypes.ts b/public-typescript/adminLotTypes.ts
@@ -5,7 +5,7 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js'
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js'
 
 import type { LOS } from '../types/globalTypes.js'
-import type * as recordTypes from '../types/recordTypes.js'
+import type { LotType, LotTypeField } from '../types/recordTypes.js'
 
 declare const cityssm: cityssmGlobal
 declare const bulmaJS: BulmaJS
@@ -15,7 +15,7 @@ declare const exports: Record<string, unknown>
 type ResponseJSON =
   | {
       success: true
-      lotTypes: recordTypes.LotType[]
+      lotTypes: LotType[]
       lotTypeFieldId?: number
     }
   | {
@@ -29,7 +29,7 @@ type ResponseJSON =
     '#container--lotTypes'
   ) as HTMLElement
 
-  let lotTypes = exports.lotTypes as recordTypes.LotType[]
+  let lotTypes = exports.lotTypes as LotType[]
   delete exports.lotTypes
 
   const expandedLotTypes = new Set<number>()
@@ -121,7 +121,7 @@ type ResponseJSON =
 
     const lotType = lotTypes.find((currentLotType) => {
       return lotTypeId === currentLotType.lotTypeId
-    }) as recordTypes.LotType
+    }) as LotType
 
     let editCloseModalFunction: () => void
 
@@ -266,13 +266,13 @@ type ResponseJSON =
   ): void {
     const lotType = lotTypes.find((currentLotType) => {
       return currentLotType.lotTypeId === lotTypeId
-    }) as recordTypes.LotType
+    }) as LotType
 
     const lotTypeField = (lotType.lotTypeFields ?? []).find(
       (currentLotTypeField) => {
         return currentLotTypeField.lotTypeFieldId === lotTypeFieldId
       }
-    ) as recordTypes.LotTypeField
+    ) as LotTypeField
 
     let minimumLengthElement: HTMLInputElement
     let maximumLengthElement: HTMLInputElement
@@ -464,7 +464,7 @@ type ResponseJSON =
   function renderLotTypeFields(
     panelElement: HTMLElement,
     lotTypeId: number,
-    lotTypeFields: recordTypes.LotTypeField[]
+    lotTypeFields: LotTypeField[]
   ): void {
     if (lotTypeFields.length === 0) {
       // eslint-disable-next-line no-unsanitized/method

diff --git a/public-typescript/adminOccupancyTypes.ts b/public-typescript/adminOccupancyTypes.ts
@@ -5,7 +5,7 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js'
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js'
 
 import type { LOS } from '../types/globalTypes.js'
-import type * as recordTypes from '../types/recordTypes.js'
+import type { OccupancyType, OccupancyTypeField } from '../types/recordTypes.js'
 
 declare const cityssm: cityssmGlobal
 declare const bulmaJS: BulmaJS
@@ -15,8 +15,8 @@ declare const exports: Record<string, unknown>
 type ResponseJSON =
   | {
       success: true
-      occupancyTypes: recordTypes.OccupancyType[]
-      allOccupancyTypeFields: recordTypes.OccupancyTypeField[]
+      occupancyTypes: OccupancyType[]
+      allOccupancyTypeFields: OccupancyTypeField[]
       occupancyTypeFieldId?: number
     }
   | {
@@ -34,11 +34,11 @@ type ResponseJSON =
     '#container--occupancyTypePrints'
   ) as HTMLElement
 
-  let occupancyTypes = exports.occupancyTypes as recordTypes.OccupancyType[]
+  let occupancyTypes = exports.occupancyTypes as OccupancyType[]
   delete exports.occupancyTypes
 
   let allOccupancyTypeFields =
-    exports.allOccupancyTypeFields as recordTypes.OccupancyTypeField[]
+    exports.allOccupancyTypeFields as OccupancyTypeField[]
   delete exports.allOccupancyTypeFields
 
   const expandedOccupancyTypes = new Set<number>()
@@ -78,8 +78,8 @@ type ResponseJSON =
     const responseJSON = rawResponseJSON as {
       success: boolean
       errorMessage?: string
-      occupancyTypes: recordTypes.OccupancyType[]
-      allOccupancyTypeFields: recordTypes.OccupancyTypeField[]
+      occupancyTypes: OccupancyType[]
+      allOccupancyTypeFields: OccupancyTypeField[]
     }
 
     if (responseJSON.success) {
@@ -138,7 +138,7 @@ type ResponseJSON =
 
     const occupancyType = occupancyTypes.find((currentOccupancyType) => {
       return occupancyTypeId === currentOccupancyType.occupancyTypeId
-    }) as recordTypes.OccupancyType
+    }) as OccupancyType
 
     let editCloseModalFunction: () => void
 
@@ -283,7 +283,7 @@ type ResponseJSON =
     occupancyTypeId: number,
     occupancyTypeFieldId: number
   ): void {
-    let occupancyType: recordTypes.OccupancyType | undefined
+    let occupancyType: OccupancyType | undefined
 
     if (occupancyTypeId) {
       occupancyType = occupancyTypes.find((currentOccupancyType) => {
@@ -299,7 +299,7 @@ type ResponseJSON =
       return (
         currentOccupancyTypeField.occupancyTypeFieldId === occupancyTypeFieldId
       )
-    }) as recordTypes.OccupancyTypeField
+    }) as OccupancyTypeField
 
     let minimumLengthElement: HTMLInputElement
     let maximumLengthElement: HTMLInputElement
@@ -498,7 +498,7 @@ type ResponseJSON =
   function renderOccupancyTypeFields(
     panelElement: HTMLElement,
     occupancyTypeId: number | undefined,
-    occupancyTypeFields: recordTypes.OccupancyTypeField[]
+    occupancyTypeFields: OccupancyTypeField[]
   ): void {
     if (occupancyTypeFields.length === 0) {
       // eslint-disable-next-line no-unsanitized/method

diff --git a/public-typescript/lotEdit.ts b/public-typescript/lotEdit.ts
@@ -5,7 +5,7 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js'
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js'
 
 import type { LOS } from '../types/globalTypes.js'
-import type * as recordTypes from '../types/recordTypes.js'
+import type { LotComment, LotTypeField } from '../types/recordTypes.js'
 
 declare const cityssm: cityssmGlobal
 declare const bulmaJS: BulmaJS
@@ -153,7 +153,7 @@ declare const exports: Record<string, unknown>
         },
         (rawResponseJSON) => {
           const responseJSON = rawResponseJSON as {
-            lotTypeFields: recordTypes.LotTypeField[]
+            lotTypeFields: LotTypeField[]
           }
 
           if (responseJSON.lotTypeFields.length === 0) {
@@ -274,7 +274,7 @@ declare const exports: Record<string, unknown>
 
   // Comments
 
-  let lotComments = exports.lotComments as recordTypes.LotComment[]
+  let lotComments = exports.lotComments as LotComment[]
   delete exports.lotComments
 
   function openEditLotComment(clickEvent: Event): void {
@@ -286,7 +286,7 @@ declare const exports: Record<string, unknown>
 
     const lotComment = lotComments.find((currentLotComment) => {
       return currentLotComment.lotCommentId === lotCommentId
-    }) as recordTypes.LotComment
+    }) as LotComment
 
     let editFormElement: HTMLFormElement
     let editCloseModalFunction: () => void
@@ -301,7 +301,7 @@ declare const exports: Record<string, unknown>
           const responseJSON = rawResponseJSON as {
             success: boolean
             errorMessage?: string
-            lotComments: recordTypes.LotComment[]
+            lotComments: LotComment[]
           }
 
           if (responseJSON.success) {
@@ -397,7 +397,7 @@ declare const exports: Record<string, unknown>
           const responseJSON = rawResponseJSON as {
             success: boolean
             errorMessage?: string
-            lotComments: recordTypes.LotComment[]
+            lotComments: LotComment[]
           }
 
           if (responseJSON.success) {
@@ -502,7 +502,7 @@ declare const exports: Record<string, unknown>
         (rawResponseJSON) => {
           const responseJSON = rawResponseJSON as {
             success: boolean
-            lotComments: recordTypes.LotComment[]
+            lotComments: LotComment[]
           }
 
           if (responseJSON.success) {

diff --git a/public-typescript/lotOccupancyEdit.js b/public-typescript/lotOccupancyEdit.js
@@ -361,15 +361,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
             submitEvent.preventDefault();
             const lotName = lotSelectModalElement.querySelector('#lotCreate--lotName').value;
             cityssm.postJSON(`${los.urlPrefix}/lots/doCreateLot`, submitEvent.currentTarget, (rawResponseJSON) => {
-                var _a;
+                var _a, _b;
                 const responseJSON = rawResponseJSON;
                 if (responseJSON.success) {
-                    renderSelectedLotAndClose(responseJSON.lotId, lotName);
+                    renderSelectedLotAndClose((_a = responseJSON.lotId) !== null && _a !== void 0 ? _a : '', lotName);
                 }
                 else {
                     bulmaJS.alert({
                         title: `Error Creating ${los.escapedAliases.Lot}`,
-                        message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : '',
+                        message: (_b = responseJSON.errorMessage) !== null && _b !== void 0 ? _b : '',
                         contextualColorName: 'danger'
                     });
                 }

diff --git a/public-typescript/lotOccupancyEdit/lotOccupancyEdit.js b/public-typescript/lotOccupancyEdit/lotOccupancyEdit.js
@@ -361,15 +361,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
             submitEvent.preventDefault();
             const lotName = lotSelectModalElement.querySelector('#lotCreate--lotName').value;
             cityssm.postJSON(`${los.urlPrefix}/lots/doCreateLot`, submitEvent.currentTarget, (rawResponseJSON) => {
-                var _a;
+                var _a, _b;
                 const responseJSON = rawResponseJSON;
                 if (responseJSON.success) {
-                    renderSelectedLotAndClose(responseJSON.lotId, lotName);
+                    renderSelectedLotAndClose((_a = responseJSON.lotId) !== null && _a !== void 0 ? _a : '', lotName);
                 }
                 else {
                     bulmaJS.alert({
                         title: `Error Creating ${los.escapedAliases.Lot}`,
-                        message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : '',
+                        message: (_b = responseJSON.errorMessage) !== null && _b !== void 0 ? _b : '',
                         contextualColorName: 'danger'
                     });
                 }