From 7f32d0a14a42bcb10e904faad11923206420a6fe Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 3 Apr 2025 15:08:35 -0400 Subject: [PATCH] linting --- data/config.baseSsm.js | 4 ++-- data/config.baseSsm.ts | 7 +++---- temp/legacyImportFromCsv/data.cemeteries.js | 2 +- temp/legacyImportFromCsv/data.cemeteries.ts | 2 +- types/recordTypes.d.ts | 18 +++++++++--------- types/recordTypes.ts | 20 ++++++++++---------- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/data/config.baseSsm.js b/data/config.baseSsm.js index adab87c7..42b7a9a7 100644 --- a/data/config.baseSsm.js +++ b/data/config.baseSsm.js @@ -1,8 +1,8 @@ -import path from 'node:path'; import { config as cemeteryConfig } from './config.baseOntario.js'; export const config = { ...cemeteryConfig }; config.aliases.externalReceiptNumber = 'GP Receipt Number'; -config.settings.publicInternalPath = path.join('..', 'sunrise-cms-saultstemarie', 'public-internal'); +config.settings.publicInternalPath = + '../sunrise-cms-saultstemarie/public-internal'; config.settings.burialSites.burialSiteNameSegments = { includeCemeteryKey: true, separator: '-', diff --git a/data/config.baseSsm.ts b/data/config.baseSsm.ts index 09d9b411..e9dd0ca1 100644 --- a/data/config.baseSsm.ts +++ b/data/config.baseSsm.ts @@ -1,5 +1,3 @@ -import path from 'node:path' - import type { Config } from '../types/configTypes.js' import { config as cemeteryConfig } from './config.baseOntario.js' @@ -8,12 +6,13 @@ export const config: Config = { ...cemeteryConfig } config.aliases.externalReceiptNumber = 'GP Receipt Number' -config.settings.publicInternalPath = path.join('..', 'sunrise-cms-saultstemarie', 'public-internal') +config.settings.publicInternalPath = + '../sunrise-cms-saultstemarie/public-internal' config.settings.burialSites.burialSiteNameSegments = { includeCemeteryKey: true, separator: '-', - + segments: { 1: { isAvailable: true, diff --git a/temp/legacyImportFromCsv/data.cemeteries.js b/temp/legacyImportFromCsv/data.cemeteries.js index a51915cc..7a18c89e 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.js +++ b/temp/legacyImportFromCsv/data.cemeteries.js @@ -35,7 +35,7 @@ export async function getCemeteryIdByKey(cemeteryKeyToSearch, user) { const cemeteryId = await addCemetery({ cemeteryName: cemeteryToCemeteryName[cemeteryKey] ?? cemeteryKey, cemeteryDescription: '', - cemeteryKey: cemeteryKey, + cemeteryKey, cemeterySvg: '', cemeteryLatitude: '', cemeteryLongitude: '', diff --git a/temp/legacyImportFromCsv/data.cemeteries.ts b/temp/legacyImportFromCsv/data.cemeteries.ts index 7896e67b..eb40b86e 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.ts +++ b/temp/legacyImportFromCsv/data.cemeteries.ts @@ -49,7 +49,7 @@ export async function getCemeteryIdByKey( cemeteryName: cemeteryToCemeteryName[cemeteryKey] ?? cemeteryKey, cemeteryDescription: '', - cemeteryKey: cemeteryKey, + cemeteryKey, cemeterySvg: '', diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts index 8a88a7d6..0c16dd0f 100644 --- a/types/recordTypes.d.ts +++ b/types/recordTypes.d.ts @@ -260,23 +260,23 @@ export interface IntermentContainerType extends Record { orderNumber?: number; } export interface Record { - recordCreate_userName?: string; - recordCreate_timeMillis?: number; recordCreate_dateString?: string; - recordUpdate_userName?: string; - recordUpdate_timeMillis?: number; + recordCreate_timeMillis?: number; + recordCreate_userName?: string; recordUpdate_dateString?: string; + recordUpdate_timeMillis?: number; recordUpdate_timeString?: string; - recordDelete_userName?: string; - recordDelete_timeMillis?: number; + recordUpdate_userName?: string; recordDelete_dateString?: string; + recordDelete_timeMillis?: number; + recordDelete_userName?: string; } export interface WorkOrder extends Record { workOrderId: number; - workOrderTypeId?: number; workOrderType?: string; - workOrderNumber?: string; + workOrderTypeId?: number; workOrderDescription?: string; + workOrderNumber?: string; workOrderOpenDate?: number; workOrderOpenDateString?: string; workOrderCloseDate?: number; @@ -333,9 +333,9 @@ declare global { } } export interface UserProperties { + apiKey: string; canUpdate: boolean; isAdmin: boolean; - apiKey: string; } declare module 'express-session' { interface Session { diff --git a/types/recordTypes.ts b/types/recordTypes.ts index 6fc5719b..7e307d41 100644 --- a/types/recordTypes.ts +++ b/types/recordTypes.ts @@ -325,7 +325,7 @@ export interface Fee extends Record { export interface FeeCategory extends Record { feeCategoryId: number - + feeCategory: string fees: Fee[] isGroupedFee: boolean @@ -355,18 +355,18 @@ export interface IntermentContainerType extends Record { } export interface Record { - recordCreate_userName?: string - recordCreate_timeMillis?: number recordCreate_dateString?: string + recordCreate_timeMillis?: number + recordCreate_userName?: string - recordUpdate_userName?: string - recordUpdate_timeMillis?: number recordUpdate_dateString?: string + recordUpdate_timeMillis?: number recordUpdate_timeString?: string + recordUpdate_userName?: string - recordDelete_userName?: string - recordDelete_timeMillis?: number recordDelete_dateString?: string + recordDelete_timeMillis?: number + recordDelete_userName?: string } /* @@ -376,11 +376,11 @@ export interface Record { export interface WorkOrder extends Record { workOrderId: number - workOrderTypeId?: number workOrderType?: string + workOrderTypeId?: number - workOrderNumber?: string workOrderDescription?: string + workOrderNumber?: string workOrderOpenDate?: number workOrderOpenDateString?: string @@ -463,9 +463,9 @@ declare global { } export interface UserProperties { + apiKey: string canUpdate: boolean isAdmin: boolean - apiKey: string } declare module 'express-session' {