Feature/65543 upgrade eslint to v9

admin/.babelrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   // See https://babeljs.io/docs/en/babel-preset-env#targets
   presets: [
-    ['@babel/preset-env', {targets: {node: 'current'}}],
+    ['@babel/preset-env', { targets: { node: 'current' } }],
     '@babel/preset-typescript'
   ]
 }

admin/.gitignore

@@ -69,3 +69,4 @@ dependency-graphs
 
 # typescript output directory
 dist
+tsconfig.tsbuildinfo

admin/app.js

@@ -263,10 +263,8 @@ if (config.Auth.mode === authModes.dfeSignIn) {
 
 app.use(function (req, res, next) {
   // make the user and isAuthenticated vars available in the view templates
-  // @ts-ignore
   if (req.isAuthenticated()) {
     res.locals.isAuthenticated = true
-    // @ts-ignore
     res.locals.user = req.user
   } else {
     res.locals.isAuthenticated = false
@@ -387,7 +385,7 @@ app.use(function (req, res, next) {
 })
 
 // error handler
-app.use(function (err, req, res, next) {
+app.use(function (err, req, res) {
   const errorId = uuidv4()
   res.locals.errorId = errorId
 

admin/assets/javascripts/cookie-form.js

@@ -1,7 +1,6 @@
 document.addEventListener('DOMContentLoaded', function () {
   const cookieSettingsElement = document.querySelectorAll('form[data-module=cookie-settings]')
   if (cookieSettingsElement && cookieSettingsElement.length > 0) {
-    // eslint-disable-next-line no-undef
     const cookieSettingsModule = new GOVUK.Modules.CookieSettings()
     cookieSettingsModule.start(cookieSettingsElement)
   }

admin/assets/javascripts/custom-file-upload.js

@@ -1,29 +1,28 @@
 /**
  * File upload customisation.
  */
-/* global $ */
-/* eslint-disable no-var */
+
 $(function () {
   'use strict'
 
-  function customFileUpload (e) {
-    var $formElement = $('#upload-form')
-    var $removeElement = $('#removeUploadedFile')
-    var isSubmitted = false
+  function customFileUpload () {
+    const $formElement = $('#upload-form')
+    const $removeElement = $('#removeUploadedFile')
+    let isSubmitted = false
 
-    $removeElement.on('click', function (e) {
+    $removeElement.on('click', function () {
       $removeElement.css('visibility', 'hidden')
       $removeElement.hide()
     })
 
     $('input:file').change(function (e) {
-      var hasFileForUpload = !!e.target.value
+      const hasFileForUpload = !!e.target.value
       if (!hasFileForUpload) {
         return $removeElement.click()
       }
       $removeElement.css('visibility', 'visible')
       $removeElement.show()
-      var $fileName = $(this).val()
+      const $fileName = $(this).val()
       $('.filename').html($fileName)
     })
 
@@ -32,7 +31,7 @@ $(function () {
         return false
       }
       // Update the form submit button to say it's uploading
-      var submitButton = $('#upload-form-submit')
+      const submitButton = $('#upload-form-submit')
       if (submitButton.text) {
         $('#upload-form-submit').text('Sending...')
       } else if (submitButton.val) {

admin/assets/javascripts/gds-print-popup.js

@@ -1,22 +1,20 @@
 'use strict'
-/* eslint-disable no-var */
+
 /**
  * Print popup.
  */
 if (!window.MTCAdmin) {
   window.MTCAdmin = {}
 }
 
-/* global $ window */
-
 (function () {
   window.MTCAdmin.printPopup = {
     hideUncheckedPupils: function (printContainer) {
       $(printContainer + ' tr').each(function () {
         $(this).addClass('hidden')
       })
       $('.multiple-choice-mtc > input:checkbox').each(function () {
-        var pupilId = $(this).val()
+        const pupilId = $(this).val()
         if ($(this).is(':checked')) {
           $(printContainer + ' tr.pupil-' + pupilId).removeClass('hidden')
         }

admin/assets/javascripts/gds-table-sorting.js

@@ -3,7 +3,6 @@
 /**
  * Table sorting.
  */
-/* eslint-disable no-var */
 
 if (!window.MTCAdmin) {
   window.MTCAdmin = {}
@@ -24,16 +23,16 @@ if (!window.MTCAdmin) {
     comparer: function (idx, asc, config) {
       return function (a, b) {
         return (function (v1, v2) {
-          return window.MTCAdmin.tableSort.isNumericValue(v1) && window.MTCAdmin.tableSort.isNumericValue(v2)
-            ? window.MTCAdmin.tableSort.getNumberComparisonResult(v1, v2, asc)
-            : window.MTCAdmin.tableSort.getStringComparisonResult(v1, v2, asc, config)
+          return window.MTCAdmin.tableSort.isNumericValue(v1) && window.MTCAdmin.tableSort.isNumericValue(v2) ?
+            window.MTCAdmin.tableSort.getNumberComparisonResult(v1, v2, asc) :
+            window.MTCAdmin.tableSort.getStringComparisonResult(v1, v2, asc, config)
         })(window.MTCAdmin.tableSort.getCellValue(a, idx), window.MTCAdmin.tableSort.getCellValue(b, idx))
       }
     },
 
     isNumericValue: function (v) {
-      var numericOnlyPattern = /^\d+$/
-      var numericOnlyRegExp = new RegExp(numericOnlyPattern)
+      const numericOnlyPattern = /^\d+$/
+      const numericOnlyRegExp = new RegExp(numericOnlyPattern)
       return ((typeof v === 'string' && numericOnlyRegExp.test(v)) || typeof v === 'number')
     },
 
@@ -69,8 +68,8 @@ if (!window.MTCAdmin) {
 
     applySortClass: function (headerEl) {
       // Remove sort classes from headers
-      var nodeList = document.querySelectorAll('thead tr th span')
-      for (var i = 0; i < nodeList.length; i++) {
+      const nodeList = document.querySelectorAll('thead tr th span')
+      for (let i = 0; i < nodeList.length; i++) {
         nodeList[i].className = 'sort-icon'
       }
 
@@ -99,10 +98,10 @@ if (!window.MTCAdmin) {
      */
     applySorting: function (document, tableId, config) {
       // Listen for click events and perform sorting
-      var thNodeList = document.querySelectorAll('th')
+      const thNodeList = document.querySelectorAll('th')
 
-      for (var i = 0; i < thNodeList.length; i++) {
-        var th = thNodeList[i]
+      for (let i = 0; i < thNodeList.length; i++) {
+        const th = thNodeList[i]
         window.MTCAdmin.tableSort.setUpClickHandler(th, i, tableId, config)
       }
     },
@@ -111,9 +110,9 @@ if (!window.MTCAdmin) {
       // TODO: don't sort the whole table when clicking the `tickAllCheckboxes` checkbox
       th.addEventListener('click', function () {
         window.MTCAdmin.tableSort.applySortClass(this)
-        var tbody = document.querySelector('#' + tableId + ' tbody')
-        var trNodeList = tbody.querySelectorAll('tr')
-        var trList = [].slice.call(trNodeList)
+        const tbody = document.querySelector('#' + tableId + ' tbody')
+        const trNodeList = tbody.querySelectorAll('tr')
+        const trList = [].slice.call(trNodeList)
 
         trList.sort(window.MTCAdmin.tableSort.comparer(
           i,

admin/assets/javascripts/global-scripts.js

@@ -4,28 +4,28 @@
  * pupilGroups, assignForm, restarts, generatePins, pupilsNotTakingCheck
  * are global, to be accessed by scripts in other files that use them.
  */
-/* global $, inputStatus, stickyBanner */
-/* eslint-disable no-var */
+/* global inputStatus, stickyBanner */
+
 /**
   * Methods for 'pupils not taking the check'.
   * @type {{isRadioChecked: isRadioChecked, isCheckboxChecked: isCheckboxChecked, validateForm: validateForm}}
   */
-var pupilsNotTakingCheck = {
+const pupilsNotTakingCheck = {
   /**
     * Is radio button checked?
     * @returns {boolean}
     */
   isRadioChecked: function () {
-    var el = $('input:radio[name="attendanceCode"]:checked')
+    const el = $('input:radio[name="attendanceCode"]:checked')
     return el.length > 0
   },
   /**
     * Is there at least one checkbox checked?
     * @returns {boolean}
     */
   isCheckboxChecked: function () {
-    var elCheckboxes = $('.multiple-choice-mtc > input:checkbox:checked').not('#tickAllCheckboxes')
-    var elTickAll = $('.multiple-choice-mtc > input#tickAllCheckboxes:checkbox:checked')
+    const elCheckboxes = $('.multiple-choice-mtc > input:checkbox:checked').not('#tickAllCheckboxes')
+    const elTickAll = $('.multiple-choice-mtc > input#tickAllCheckboxes:checkbox:checked')
     return elTickAll.length > 0 || elCheckboxes.length > 0
   },
   /**
@@ -41,9 +41,9 @@ var pupilsNotTakingCheck = {
   * Methods for 'Generate PINs'.
   * @type {{isCheckboxChecked: isCheckboxChecked}}
   */
-var generatePins = {
+const generatePins = {
   isCheckboxChecked: function () {
-    var el = $('.multiple-choice-mtc > input:checkbox:checked').not('#tickAllCheckboxes')
+    const el = $('.multiple-choice-mtc > input:checkbox:checked').not('#tickAllCheckboxes')
     return el.length > 0
   }
 }
@@ -52,21 +52,21 @@ var generatePins = {
   * Methods for 'Restarts'.
   * @type {{isRadioChecked: isRadioChecked, isCheckboxChecked: isCheckboxChecked, validateForm: validateForm}}
   */
-var restarts = {
+const restarts = {
   /**
     * Is radio button checked?
     * @returns {boolean}
     */
   isRadioChecked: function () {
-    var el = $('input:radio[name="restartReason"]:checked')
+    const el = $('input:radio[name="restartReason"]:checked')
     return el.length > 0
   },
   /**
     * Is there at least one checkbox checked?
     * @returns {boolean}
     */
   isCheckboxChecked: function () {
-    var el = $('.multiple-choice-mtc > input:checkbox:checked')
+    const el = $('.multiple-choice-mtc > input:checkbox:checked')
     return el.length > 0
   },
   validateForm: function () {
@@ -78,13 +78,13 @@ var restarts = {
   * Methods for 'assign check form to check windows'.
   * @type {{isCheckboxChecked: isCheckboxChecked}}
   */
-var assignForm = {
+const assignForm = {
   /**
     * Is there at least one checkbox checked?
     * @returns {boolean}
     */
   isCheckboxChecked: function () {
-    var el = $('.multiple-choice-mtc > input:checkbox:checked')
+    const el = $('.multiple-choice-mtc > input:checkbox:checked')
     return el.length > 0
   },
   /**
@@ -100,21 +100,21 @@ var assignForm = {
   * Methods for 'pupils groups'.
   * @type {{isCheckboxChecked: isCheckboxChecked, isGroupNameComplete: *}}
   */
-var pupilGroups = {
+const pupilGroups = {
   /**
     * Is there at least one checkbox checked?
     * @returns {boolean}
     */
   isCheckboxChecked: function () {
-    var elCheckboxes = $('.multiple-choice-mtc > input:checkbox:checked')
+    const elCheckboxes = $('.multiple-choice-mtc > input:checkbox:checked')
     return elCheckboxes.length > 0
   },
   /**
     * Check if name field is not empty.
     * @returns {boolean}
     */
   isGroupNameComplete: function () {
-    var elName = $.trim($('input#name').val())
+    const elName = $.trim($('input#name').val())
     return elName.length > 0
   },
   /**

admin/assets/javascripts/google-analytics.js

@@ -1,17 +1,13 @@
+/* global googleTrackingId dataLayer args */
 document.addEventListener('DOMContentLoaded', function () {
   // Disable tracking if the opt-out cookie exists.
   // To disable analytics: window['ga-disable-UA-XXXXX-Y'] = true;
   // More info on https://developers.google.com/analytics/devguides/collection/analyticsjs/user-opt-out
-  // eslint-disable-next-line no-undef
   const disableStr = 'ga-disable-' + googleTrackingId
   const consentCookie = window.GOVUK.getConsentCookie()
   window[disableStr] = consentCookie && !consentCookie.usage
-
   window.dataLayer = window.dataLayer || []
-  // eslint-disable-next-line no-undef
-  function gtag () { dataLayer.push(arguments) }
-
+  function gtag () { dataLayer.push(...args) }
   gtag('js', new Date())
-  // eslint-disable-next-line no-undef
   gtag('config', googleTrackingId, { anonymize_ip: true })
 })

admin/assets/javascripts/jquery-modal.js

@@ -3,12 +3,11 @@
  * Based on guidelines found here:
  * https://paper.dropbox.com/doc/Modal-dialog-boxes-jbsTPoITg37IIc6ybjetM
  */
-/* global $ */
-/* eslint-disable no-var */
+
 $(function () {
-  var modalForm = document.querySelector('#js-modal-form')
-  var hasModalForm = modalForm && modalForm.length > 0
-  function startModal (e) {
+  const modalForm = document.querySelector('#js-modal-form')
+  const hasModalForm = modalForm && modalForm.length > 0
+  function startModal () {
     $('.modal-link').on('click', function (e) {
       if (hasModalForm) {
         toggleShowHideModal(e)
@@ -27,7 +26,7 @@ $(function () {
         $('#js-modal-confirmation-button').attr('href', '')
       }
     })
-    $('#js-modal-confirmation-button').on('click', function (e) {
+    $('#js-modal-confirmation-button').on('click', function () {
       if (hasModalForm) {
         modalForm.submit()
       }
@@ -36,7 +35,7 @@ $(function () {
       toggleShowHideModal(e)
     })
     $('#modal-wrapper').on('keydown', function (e) {
-      var modalBox = $('#js-modal-box')
+      const modalBox = $('#js-modal-box')
       // escape keystroke should hide the modal when it is visible
       if (e.keyCode === 27 && modalBox.hasClass('show')) {
         toggleShowHideModal(e)
@@ -71,7 +70,7 @@ $(function () {
       e.preventDefault()
     }
     $('#js-modal-overlay').toggleClass('show')
-    var modalBox = $('#js-modal-box')
+    const modalBox = $('#js-modal-box')
     if (modalBox.hasClass('show')) {
       modalBox.removeClass('show')
       $('#js-modal-link').focus()

admin/assets/javascripts/layout.js

@@ -1,7 +1,6 @@
 document.addEventListener('DOMContentLoaded', function () {
   window.GOVUKFrontend.initAll()
   const cookieElement = document.querySelectorAll('div[data-module=cookie-banner]')
-  // eslint-disable-next-line no-undef
   const module = new GOVUK.Modules.CookieBanner()
   module.start(cookieElement)
 })

admin/assets/javascripts/mtc-autocomplete.js

@@ -2,12 +2,11 @@
 /**
  * Autocomplete component
  */
-/* eslint-disable no-var */
+
 if (!window.MTCAdmin) {
   window.MTCAdmin = {}
 }
 
-/* global $ */
 (function () {
   window.MTCAdmin.autoComplete = {
     /**
@@ -95,7 +94,7 @@ if (!window.MTCAdmin) {
     setupLinkedConfirm: function (autoCompleteContainer, linkedContainer, findValueFunc) {
       return function (event, value) {
         if (typeof value === 'undefined') return
-        var ul = $(linkedContainer).find('ul')
+        const ul = $(linkedContainer).find('ul')
         /*
          * The autocomplete library triggers the dropdown when setting the value on the linkedContainer
          * we need to hide the menu using the style attribute, wait for the dropdown to appear,