Enable ESLint and remove unused variables

.eslintrc.js

@@ -4,7 +4,6 @@
 module.exports = {
   extends: ['prettier'],
   ignorePatterns: [
-    '**/app/**',
     '**/public/**',
 
     // Enable dotfile linting
@@ -44,6 +43,14 @@ module.exports = {
         'jest-dom'
       ],
       rules: {
+        // Allow unused variables via spread syntax
+        '@typescript-eslint/no-unused-vars': [
+          'error',
+          {
+            ignoreRestSiblings: true
+          }
+        ],
+
         // Always import Node.js packages from `node:*`
         'import/enforce-node-protocol-usage': ['error', 'always'],
 
@@ -65,6 +72,14 @@ module.exports = {
           }
         ],
 
+        // Allow extra nested properties in JSDoc
+        'jsdoc/check-param-names': [
+          'warn',
+          {
+            disableExtraPropertyReporting: true
+          }
+        ],
+
         // JSDoc blocks are optional by default
         'jsdoc/require-jsdoc': 'off',
 
@@ -90,6 +105,13 @@ module.exports = {
           {
             startLines: 1
           }
+        ],
+
+        'promise/catch-or-return': [
+          'error',
+          {
+            allowFinally: true
+          }
         ]
       },
       settings: {

app/assets/javascript/custom-elements/is-sticky.js

@@ -34,6 +34,7 @@ const IsStickyComponent = class extends HTMLElement {
     let inThrottle
     return function () {
       const args = arguments
+      // eslint-disable-next-line @typescript-eslint/no-this-alias
       const context = this
       if (!inThrottle) {
         callback.apply(context, args)

app/assets/javascript/expanded-state-tracker.js

@@ -69,7 +69,7 @@
     const path = window.location.pathname
 
     // Clear if on main event page (not sub-pages)
-    if (path.match(/^\/clinics\/[^\/]+\/events\/[^\/]+\/?$/)) {
+    if (path.match(/^\/clinics\/[^/]+\/events\/[^/]+\/?$/)) {
       clearAllExpandedStates()
     }
   }

app/assets/javascript/mammogram-viewer.js

@@ -88,7 +88,7 @@ const MammogramViewer = {
         mammogramWindow = null
         localStorage.removeItem(VIEWER_STORAGE_KEY)
       }
-    } catch (e) {
+    } catch {
       mammogramWindow = null
       localStorage.removeItem(VIEWER_STORAGE_KEY)
     }
@@ -207,7 +207,9 @@ const MammogramViewer = {
         if (mammogramWindow) {
           mammogramWindow.close()
         }
-      } catch (err) {}
+      } catch {
+        // Ignore errors
+      }
 
       localStorage.removeItem(VIEWER_STORAGE_KEY)
       this.openNew(participantName)
@@ -273,7 +275,7 @@ const MammogramViewer = {
     // Only check our direct reference, don't try to find windows
     try {
       return mammogramWindow && !mammogramWindow.closed
-    } catch (e) {
+    } catch {
       // If there's an error accessing the window property, it's likely closed
       return false
     }
@@ -307,6 +309,8 @@ window.addEventListener('beforeunload', function () {
   if (window.inReadingContext && mammogramWindow && !mammogramWindow.closed) {
     try {
       localStorage.setItem('wasInReadingContext', 'true')
-    } catch (e) {}
+    } catch {
+      // Ignore errors
+    }
   }
 })

app/assets/javascript/modal.js

@@ -116,7 +116,7 @@ class AppModal {
         this.handleAjax(actionElement)
         break
 
-      default:
+      default: {
         // Fire custom event for other action types
         const customEvent = new CustomEvent('modal:action', {
           detail: {
@@ -127,6 +127,7 @@ class AppModal {
           }
         })
         this.modal.dispatchEvent(customEvent)
+      }
     }
   }
 
@@ -154,6 +155,7 @@ class AppModal {
       body: method !== 'GET' ? JSON.stringify(modalData) : null
     })
       .then((response) => {
+        // eslint-disable-next-line promise/always-return
         if (response.ok) {
           if (closeOnSuccess) {
             this.close()

app/config.js

@@ -1,7 +1,7 @@
 // app/config.js
 
 // Use this file to change prototype configuration.
-const path = require('path')
+const path = require('node:path')
 
 module.exports = {
   // Service name

app/data/session-data-defaults.js

@@ -1,14 +1,16 @@
 // app/data/session-data-defaults.js
 
-const users = require('./users')
 // Used to simulate in prototype
-const breastScreeningUnits = require('./breast-screening-units')
 // All breast screening units
-const allBreastScreeningUnits = require('./all-breast-screening-units')
-const path = require('path')
-const fs = require('fs')
-const { needsRegeneration } = require('../lib/utils/regenerate-data')
+const fs = require('node:fs')
+const path = require('node:path')
+
 const config = require('../config')
+const { needsRegeneration } = require('../lib/utils/regenerate-data')
+
+const allBreastScreeningUnits = require('./all-breast-screening-units')
+const breastScreeningUnits = require('./breast-screening-units')
+const users = require('./users')
 
 // Check if generated data folder exists and create if needed
 const generatedDataPath = path.join(__dirname, 'generated')
@@ -48,8 +50,11 @@ if (needsRegeneration(generationInfo)) {
 
 // Load generated data
 try {
+  // eslint-disable-next-line n/no-unpublished-require
   participants = require('./generated/participants.json').participants
+  // eslint-disable-next-line n/no-unpublished-require
   clinics = require('./generated/clinics.json').clinics
+  // eslint-disable-next-line n/no-unpublished-require
   events = require('./generated/events.json').events
 } catch (err) {
   console.warn('Error loading generated data:', err)

app/filters.js

@@ -1,9 +1,9 @@
 // app/filters.js
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 
-module.exports = function (env) {
+module.exports = function () {
   /* eslint-disable-line func-names,no-unused-vars */
   /**
    * Instantiate object used to store the methods registered as a

app/filters/tags.js

@@ -1,8 +1,9 @@
 // app/filters/tags.js
 
 const { safe: nunjucksSafe } = require('nunjucks/src/filters')
-const { formatWords, sentenceCase, snakeCase } = require('../lib/utils/strings')
+
 const { getStatusTagColour, getStatusText } = require('../lib/utils/status')
+const { formatWords, sentenceCase, snakeCase } = require('../lib/utils/strings')
 
 /**
  * Convert a status string into an NHS tag
@@ -38,7 +39,7 @@ const toTag = (status, options = {}) => {
     .join(' ')
 
   // Generate tag HTML
-  const idAttr = options.id ? ` id=\"${options.id}\"` : ''
+  const idAttr = options.id ? ` id="${options.id}"` : ''
   return nunjucksSafe(`<strong${idAttr} class="${classes}">${text}</strong>`)
 }
 

app/lib/generate-seed-data.js

@@ -3,27 +3,26 @@
 // to run: node app/lib/generate-seed-data.js
 // can also be run from ui at localhost:3000/settings
 
+const fs = require('node:fs')
+const path = require('node:path')
+
 const dayjs = require('dayjs')
-const fs = require('fs')
-const path = require('path')
-const config = require('../config')
 const weighted = require('weighted')
 
-const { generateParticipant } = require('./generators/participant-generator')
-const { generateClinicsForBSU } = require('./generators/clinic-generator')
-const { generateEvent } = require('./generators/event-generator')
-const { getCurrentRiskLevel } = require('./utils/participants')
-const { generateReadingData } = require('./generators/reading-generator')
-
-const riskLevels = require('../data/risk-levels')
-
+const config = require('../config')
 // Load existing data
 const breastScreeningUnits = require('../data/breast-screening-units')
 const ethnicities = require('../data/ethnicities')
-
+const riskLevels = require('../data/risk-levels')
 // Hardcoded scenarios for user research
 const testScenarios = require('../data/test-scenarios')
 
+const { generateClinicsForBSU } = require('./generators/clinic-generator')
+const { generateEvent } = require('./generators/event-generator')
+const { generateParticipant } = require('./generators/participant-generator')
+const { generateReadingData } = require('./generators/reading-generator')
+const { getCurrentRiskLevel } = require('./utils/participants')
+
 // Create an index of participants by risk level for efficient lookup
 // Create an index of participants by risk level for efficient lookup
 const createParticipantIndices = (participants, clinicDate, events = []) => {
@@ -129,9 +128,6 @@ const generateClinicsForDay = (
       })
     : []
 
-  // Pre-filter eligible participants once
-  const clinicDate = dayjs(date)
-
   // Generate clinics for this day
   const newClinics = generateClinicsForBSU({
     date: date.toDate(),

app/lib/generators/clinic-generator.js

@@ -1,10 +1,11 @@
 // app/lib/generators/clinic-generator.js
 
 const { faker } = require('@faker-js/faker')
-const generateId = require('../utils/id-generator')
 const dayjs = require('dayjs')
 const weighted = require('weighted')
+
 const config = require('../../config')
+const generateId = require('../utils/id-generator')
 
 const determineClinicType = (location, breastScreeningUnit) => {
   // First check location-specific service types
@@ -246,7 +247,7 @@ const generateClinicsForBSU = ({ date, breastScreeningUnit }) => {
       return [clinic]
     } else {
       // For paired sessions, create two clinics
-      return selectedPattern.sessions.map((sessionTimes, sessionIndex) => {
+      return selectedPattern.sessions.map(() => {
         const clinic = generateClinic(
           date,
           location,

app/lib/generators/event-generator.js

@@ -1,17 +1,19 @@
 // app/lib/generators/event-generator.js
 
-const generateId = require('../utils/id-generator')
 const { faker } = require('@faker-js/faker')
-const weighted = require('weighted')
 const dayjs = require('dayjs')
+const weighted = require('weighted')
+
 const config = require('../../config')
-const { STATUS_GROUPS, isCompleted, isFinal } = require('../utils/status')
+const users = require('../../data/users')
+const generateId = require('../utils/id-generator')
+const { STATUS_GROUPS, isCompleted } = require('../utils/status')
+
 const { generateMammogramImages } = require('./mammogram-generator')
-const { generateSymptoms } = require('./symptoms-generator')
 const {
   generateSpecialAppointment
 } = require('./special-appointment-generator')
-const users = require('../../data/users')
+const { generateSymptoms } = require('./symptoms-generator')
 
 const NOT_SCREENED_REASONS = [
   'Recent mammogram at different facility',
@@ -71,7 +73,6 @@ const generateEvent = ({
   slot,
   participant,
   clinic,
-  outcomeWeights,
   forceStatus = null,
   id = null,
   specialAppointmentOverride = null,
@@ -266,43 +267,6 @@ const generateEvent = ({
   return eventBase
 }
 
-const generateStatusHistory = (finalStatus, dateTime) => {
-  const history = []
-  const baseDate = new Date(dateTime)
-
-  // Always starts with scheduled status
-  history.push({
-    status: 'event_scheduled',
-    timestamp: new Date(baseDate.getTime() - 24 * 60 * 60 * 1000).toISOString() // Day before
-  })
-
-  // Add intermediate statuses based on final status
-  if (isCompleted(finalStatus)) {
-    history.push(
-      {
-        status: 'checked_in',
-        timestamp: new Date(baseDate.getTime() - 10 * 60 * 1000).toISOString() // 10 mins before
-      },
-      // {
-      //   status: 'in_progress',
-      //   timestamp: new Date(baseDate).toISOString()
-      // },
-      {
-        status: finalStatus,
-        timestamp: new Date(baseDate.getTime() + 15 * 60 * 1000).toISOString() // 15 mins after
-      }
-    )
-  } else {
-    // For did_not_attend and attended_not_screened, just add the final status
-    history.push({
-      status: finalStatus,
-      timestamp: new Date(baseDate.getTime() + 15 * 60 * 1000).toISOString()
-    })
-  }
-
-  return history
-}
-
 module.exports = {
   generateEvent
 }

app/lib/generators/mammogram-generator.js

@@ -1,9 +1,7 @@
 // app/lib/generators/mammogram-generator.js
 
 const { faker } = require('@faker-js/faker')
-const generateId = require('../utils/id-generator')
 const dayjs = require('dayjs')
-const weighted = require('weighted')
 
 const STANDARD_VIEWS = [
   { side: 'right', view: 'mediolateral oblique' },

app/lib/generators/participant-generator.js

@@ -1,12 +1,14 @@
 // app/lib/generators/participant-generator.js
 
 const { faker } = require('@faker-js/faker')
-const generateId = require('../utils/id-generator')
-const weighted = require('weighted')
-const { generateBSUAppropriateAddress } = require('./address-generator')
+const dayjs = require('dayjs')
 const _ = require('lodash')
+const weighted = require('weighted')
+
 const riskLevels = require('../../data/risk-levels')
-const dayjs = require('dayjs')
+const generateId = require('../utils/id-generator')
+
+const { generateBSUAppropriateAddress } = require('./address-generator')
 
 /**
  * Generate a precise date of birth within the specified age range