From 5a505dff24bd6fac864d0654d601454166f8eb17 Mon Sep 17 00:00:00 2001
From: "Sean R. Abraham" <seanabraham@gmail.com>
Date: Tue, 17 Dec 2024 09:29:08 -0500
Subject: [PATCH] lint all the JavaScript files

this applies some standard JS style/fixes for errorprone
usage, and it tidies up a few confusing code bits too.

This should be pretty much a no-op
---
 src/ims/element/static/admin_events.js     |  71 +++--
 src/ims/element/static/admin_streets.js    |  36 ++-
 src/ims/element/static/admin_types.js      |  31 +-
 src/ims/element/static/ims.js              | 205 ++++++-------
 src/ims/element/static/incident.js         | 323 +++++++++------------
 src/ims/element/static/incident_report.js  |  49 ++--
 src/ims/element/static/incident_reports.js |  43 +--
 src/ims/element/static/incidents.js        |  68 ++---
 8 files changed, 380 insertions(+), 446 deletions(-)

diff --git a/src/ims/element/static/admin_events.js b/src/ims/element/static/admin_events.js
index 349f5d85d..77d6e681f 100644
--- a/src/ims/element/static/admin_events.js
+++ b/src/ims/element/static/admin_events.js
@@ -28,19 +28,19 @@ function initPage() {
 }
 
 
-var accessControlList = null
+let accessControlList = null
 
 function loadAccessControlList(success) {
     function ok(data, status, xhr) {
         accessControlList = data;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load access control list:\n" + error
+        const message = "Failed to load access control list:\n" + error
         console.error(message);
         window.alert(message);
     }
@@ -49,13 +49,13 @@ function loadAccessControlList(success) {
 }
 
 
-var _accessTemplate = null;
-var _entryTemplate = null;
+let _accessTemplate = null;
+let _entryTemplate = null;
 
-var accessModes = ["readers", "writers", "reporters"];
+let accessModes = ["readers", "writers", "reporters"];
 
 function drawAccess() {
-    var container = $("#event_access_container");
+    const container = $("#event_access_container");
 
     if (_accessTemplate == null) {
         _accessTemplate = container.children(".event_access:first");
@@ -68,13 +68,9 @@ function drawAccess() {
 
     container.empty();
 
-    for (var i in events) {
-        var event = events[i];
-
-        for (var i in accessModes) {
-            var mode = accessModes[i];
-
-            var eventAccess = $(_accessTemplate).clone();
+    for (const event of events) {
+        for (const mode of accessModes) {
+            const eventAccess = $(_accessTemplate).clone();
 
             // Add an id to the element for future reference
             eventAccess.attr("id", "event_access_" + event + "_" + mode);
@@ -89,25 +85,24 @@ function drawAccess() {
 
 
 function updateEventAccess(event, mode) {
-    var eventACL = accessControlList[event];
+    const eventACL = accessControlList[event];
 
-    if (eventACL == undefined) {
+    if (eventACL == null) {
         return;
     }
 
-    var eventAccess = $("#event_access_" + event + "_" + mode);
+    const eventAccess = $("#event_access_" + event + "_" + mode);
 
     // Set displayed event name and mode
     eventAccess.find(".event_name").text(event);
     eventAccess.find(".access_mode").text(mode);
 
-    var entryContainer = eventAccess.find(".list-group:first");
+    const entryContainer = eventAccess.find(".list-group:first");
 
     entryContainer.empty();
 
-    for (var i in eventACL[mode]) {
-        var expression = eventACL[mode][i];
-        var entryItem = _entryTemplate.clone();
+    for (const expression of eventACL[mode]) {
+        const entryItem = _entryTemplate.clone();
 
         entryItem.append(expression);
         entryItem.attr("value", expression);
@@ -118,7 +113,7 @@ function updateEventAccess(event, mode) {
 
 
 function addEvent(sender) {
-    var event = sender.value.trim();
+    const event = sender.value.trim();
 
     function refresh() {
         loadAccessControlList(drawAccess);
@@ -130,7 +125,7 @@ function addEvent(sender) {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to add event:\n" + requestError
+        const message = "Failed to add event:\n" + requestError
         console.log(message);
         refresh();
         controlHasError($(sender));
@@ -142,22 +137,22 @@ function addEvent(sender) {
 
 
 function addAccess(sender) {
-    var container = $(sender).parents(".event_access:first");
-    var event = container.find(".event_name:first").text();
-    var mode = container.find(".access_mode:first").text();
-    var newExpression = sender.value.trim();
+    const container = $(sender).parents(".event_access:first");
+    const event = container.find(".event_name:first").text();
+    const mode = container.find(".access_mode:first").text();
+    const newExpression = sender.value.trim();
 
-    var acl = accessControlList[event][mode].slice();
+    const acl = accessControlList[event][mode].slice();
 
     acl.push(newExpression);
 
-    edits = {};
+    const edits = {};
     edits[event] = {};
     edits[event][mode] = acl;
 
     function refresh() {
-        for (var i in accessModes) {
-            updateEventAccess(event, accessModes[i]);
+        for (const mode of accessModes) {
+            updateEventAccess(event, mode);
         }
     }
 
@@ -176,12 +171,12 @@ function addAccess(sender) {
 
 
 function removeAccess(sender) {
-    var container = $(sender).parents(".event_access:first");
-    var event = container.find(".event_name:first").text();
-    var mode = container.find(".access_mode:first").text();
-    var expression = $(sender).parent().attr("value").trim();
+    const container = $(sender).parents(".event_access:first");
+    const event = container.find(".event_name:first").text();
+    const mode = container.find(".access_mode:first").text();
+    const expression = $(sender).parent().attr("value").trim();
 
-    var acl = accessControlList[event][mode].slice();
+    const acl = accessControlList[event][mode].slice();
 
     if (acl.indexOf(expression) < 0) {
         console.error("no such ACL: " + expression);
@@ -190,7 +185,7 @@ function removeAccess(sender) {
 
     acl.splice(acl.indexOf(expression), 1);
 
-    edits = {};
+    const edits = {};
     edits[event] = {};
     edits[event][mode] = acl;
 
@@ -218,7 +213,7 @@ function sendACL(edits, success, error) {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to edit ACL:\n" + requestError
+        const message = "Failed to edit ACL:\n" + requestError;
         console.log(message);
         error();
         window.alert(message);
diff --git a/src/ims/element/static/admin_streets.js b/src/ims/element/static/admin_streets.js
index e761a1e3b..94f4b0d57 100644
--- a/src/ims/element/static/admin_streets.js
+++ b/src/ims/element/static/admin_streets.js
@@ -28,21 +28,21 @@ function initPage() {
 }
 
 
-var streets = null;
+let streets = null;
 
 function loadStreets(success) {
-    var url = url_streets;
+    const url = url_streets;
 
     function ok(data, status, xhr) {
         streets = data;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load streets:\n" + error
+        const message = "Failed to load streets:\n" + error;
         console.error(message);
         window.alert(message);
     }
@@ -51,11 +51,11 @@ function loadStreets(success) {
 }
 
 
-var _streetsTemplate = null;
-var _entryTemplate = null;
+let _streetsTemplate = null;
+let _entryTemplate = null;
 
 function drawStreets() {
-    var container = $("#event_streets_container");
+    const container = $("#event_streets_container");
 
     if (_streetsTemplate == null) {
         _streetsTemplate = container.children(".event_streets:first");
@@ -68,10 +68,8 @@ function drawStreets() {
 
     container.empty();
 
-    for (var i in events) {
-        var event = events[i];
-
-        var eventStreets = $(_streetsTemplate).clone();
+    for (const event of events) {
+        const eventStreets = $(_streetsTemplate).clone();
 
         // Add an id to the element for future reference
         eventStreets.attr("id", "event_streets_" + event);
@@ -85,24 +83,24 @@ function drawStreets() {
 
 
 function updateEventStreets(event) {
-    var eventStreets = streets[event];
+    const eventStreets = streets[event];
 
-    if (eventStreets == undefined) {
+    if (eventStreets == null) {
         return;
     }
 
-    var eventStreetsElement = $("#event_streets_" + event);
+    const eventStreetsElement = $("#event_streets_" + event);
 
     // Set displayed event name
     eventStreetsElement.find(".event_name").text(event);
 
-    var entryContainer = eventStreetsElement.find(".list-group:first");
+    const entryContainer = eventStreetsElement.find(".list-group:first");
 
     entryContainer.empty();
 
-    for (var streetID in eventStreets) {
-        var streetName = eventStreets[streetID];
-        var entryItem = _entryTemplate.clone();
+    for (const streetID in eventStreets) {
+        const streetName = eventStreets[streetID];
+        const entryItem = _entryTemplate.clone();
 
         entryItem.append(streetID + ": " + streetName);
         entryItem.attr("value", streetID);
@@ -128,7 +126,7 @@ function sendStreets(edits, success, error) {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to edit streets:\n" + requestError
+        const message = "Failed to edit streets:\n" + requestError;
         console.log(message);
         error();
         window.alert(message);
diff --git a/src/ims/element/static/admin_types.js b/src/ims/element/static/admin_types.js
index 98dfb8996..9bdde77cc 100644
--- a/src/ims/element/static/admin_types.js
+++ b/src/ims/element/static/admin_types.js
@@ -33,16 +33,16 @@ function loadAndDrawIncidentTypes() {
 }
 
 
-var incidentTypes = null;
-var incidentTypesVisible = null;
+let incidentTypes = null;
+let incidentTypesVisible = null;
 
 function loadIncidentTypes(success) {
-    var gotAll = false;
-    var gotVisible = false;
+    let gotAll = false;
+    let gotVisible = false;
 
     function ok() {
         if (gotAll && gotVisible) {
-            if (success != undefined) {
+            if (success) {
                 success();
             }
         }
@@ -62,7 +62,7 @@ function loadIncidentTypes(success) {
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load incident types:\n" + error
+        const message = "Failed to load incident types:\n" + error;
         console.error(message);
         window.alert(message);
     }
@@ -72,11 +72,11 @@ function loadIncidentTypes(success) {
 }
 
 
-var _incidentTypesTemplate = null;
-var _entryTemplate = null;
+let _incidentTypesTemplate = null;
+let _entryTemplate = null;
 
 function drawIncidentTypes() {
-    var container = $("#incident_types_container");
+    const container = $("#incident_types_container");
 
     if (_incidentTypesTemplate == null) {
         _incidentTypesTemplate = container.children(".incident_types:first");
@@ -92,17 +92,16 @@ function drawIncidentTypes() {
 
 
 function updateIncidentTypes() {
-    var incidentTypesElement = $("#incident_types");
+    const incidentTypesElement = $("#incident_types");
 
-    var entryContainer = incidentTypesElement.find(".list-group:first");
+    const entryContainer = incidentTypesElement.find(".list-group:first");
 
     entryContainer.empty();
 
-    for (var i in incidentTypes) {
-        var incidentType = incidentTypes[i];
-        var entryItem = _entryTemplate.clone();
+    for (const incidentType of incidentTypes) {
+        const entryItem = _entryTemplate.clone();
 
-        if (incidentTypesVisible.indexOf(incidentType) == -1) {
+        if (incidentTypesVisible.indexOf(incidentType) === -1) {
             entryItem.addClass("item-hidden")
         } else {
             entryItem.addClass("item-visible")
@@ -157,7 +156,7 @@ function sendIncidentTypes(edits, success, error) {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to edit incident types:\n" + requestError
+        const message = "Failed to edit incident types:\n" + requestError;
         console.log(message);
         error();
         window.alert(message);
diff --git a/src/ims/element/static/ims.js b/src/ims/element/static/ims.js
index 12bf98ddb..a82225c05 100644
--- a/src/ims/element/static/ims.js
+++ b/src/ims/element/static/ims.js
@@ -99,7 +99,7 @@ setTheme(getPreferredTheme());
 // browser will implement this correctly, and any solution using .replace()
 // will be buggy.  And this will be fast.  But still, this is weak.
 
-var _domTextAreaForHaxxors = document.createElement("textarea")
+let _domTextAreaForHaxxors = document.createElement("textarea")
 
 // Convert text to HTML.
 function textAsHTML(text) {
@@ -144,9 +144,9 @@ ValueError.prototype.constructor = ValueError;
 
 // Build an array from a range.
 function range(start, end, step) {
-    if (step == undefined) {
+    if (step == null) {
         step = 1;
-    } else if (step == 0) {
+    } else if (step === 0) {
         throw new ValueError("step = 0");
     }
 
@@ -178,7 +178,7 @@ function compareReportEntries(a, b) {
 
 function jsonRequest(url, jsonOut, success, error) {
     function ok(data, status, xhr) {
-        if (success != undefined) {
+        if (success) {
             success(data, status, xhr);
         }
     }
@@ -186,29 +186,29 @@ function jsonRequest(url, jsonOut, success, error) {
     function fail(xhr, status, requestError) {
         // Intentionally empty response is not an error.
         if (
-            status == "parsererror" &&
-            xhr.status == 201 &&
-            xhr.responseText == ""
+            status === "parsererror" &&
+            xhr.status === 201 &&
+            xhr.responseText === ""
         ) {
             ok("", "", xhr);
             return;
         }
 
-        if (error != undefined) {
+        if (error) {
             error(requestError, status, xhr);
         }
     }
 
-    var args = {
+    const args = {
         "url": url,
         "method": "GET",
         "dataType": "json",
         "success": ok,
         "error": fail,
-    }
+    };
 
     if (jsonOut) {
-        var jsonText = JSON.stringify(jsonOut);
+        const jsonText = JSON.stringify(jsonOut);
 
         args["method"] = "POST";
         args["contentType"] = "application/json";
@@ -226,13 +226,13 @@ function jsonRequest(url, jsonOut, success, error) {
 
 // Pad a string representing an integer to two digits.
 function padTwo(value) {
-    if (value == undefined) {
+    if (value == null) {
         return "?";
     }
 
     value = value.toString();
 
-    if (value.length == 1) {
+    if (value.length === 1) {
         return "0" + value;
     }
 
@@ -264,7 +264,7 @@ function parseInt(stringInt) {
 
 // Create a <time> element from a date.
 function timeElement(date) {
-    var timeStampContainer = jQuery(
+    const timeStampContainer = jQuery(
         "<time />", {"datetime": date.toISOString()}
     );
     timeStampContainer.text(fullDateTime.format(date));
@@ -308,7 +308,7 @@ function controlHasError(element) {
 // Add a success indication to a control
 function controlHasSuccess(element, clearTimeout) {
     element.addClass("is-valid");
-    if (clearTimeout !== undefined) {
+    if (clearTimeout != null) {
         element.delay("1000").queue(function(next) {
             controlClear(element);
             next();
@@ -337,7 +337,7 @@ function loadBody(success) {
             $(".event-id").addClass("active-event");
         }
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
@@ -446,14 +446,14 @@ function stateSortKeyFromID(stateID) {
 
 // Look up a concentric street's name given its ID.
 function concentricStreetFromID(streetID) {
-    if (streetID == undefined) {
+    if (streetID == null) {
         return undefined;
     }
 
-    var name = concentricStreetNameByID[streetID];
-    if (name == undefined) {
+    const name = concentricStreetNameByID[streetID];
+    if (name == null) {
         console.warn("Unknown street ID: " + streetID);
-        name = undefined;
+        return undefined;
     }
     return name;
 }
@@ -462,7 +462,7 @@ function concentricStreetFromID(streetID) {
 // Return the state ID for a given incident.
 function stateForIncident(incident) {
     // Data from 2014+ should have incident.state set.
-    if (incident.state != undefined) {
+    if (incident.state !== undefined) {
         return incident.state;
     }
 
@@ -473,29 +473,24 @@ function stateForIncident(incident) {
 
 // Return a summary for a given incident.
 function summarizeIncident(incident) {
-    var summary = incident.summary;
-    var reportEntries = incident.report_entries;
+    const summary = incident.summary;
+    const reportEntries = incident.report_entries;
 
-    if (summary == undefined || summary == "") {
-        if (reportEntries == undefined) {
+    if (!summary) {
+        if (!reportEntries) {
             return "";
         }
-        else {
-            // Get the first line of the first report entry.
-            for (var i in reportEntries) {
-                var reportEntry = reportEntries[i];
-
-                if (reportEntry.system_entry) {
-                    continue;
-                }
-
-                var lines = reportEntry.text.split("\n");
+        // Get the first line of the first report entry.
+        for (const reportEntry of reportEntries) {
+            if (reportEntry.system_entry) {
+                // Don't use a system-generated entry in the summary
+                continue;
+            }
 
-                for (var j in lines) {
-                    var line = lines[j];
-                    if (line != undefined && line != "") {
-                        return line;
-                    }
+            const lines = reportEntry.text.split("\n");
+            for (const line of lines) {
+                if (line) {
+                    return line;
                 }
             }
         }
@@ -514,9 +509,8 @@ function summarizeIncidentReport(report) {
 
 // Get author for incident
 function incidentAuthor(incident) {
-    for (var i in incident.report_entries) {
-        entry = incident.report_entries[i];
-        if (entry.author != undefined) {
+    for (const entry of incident.report_entries??[]) {
+        if (entry.author) {
             return entry.author;
         }
     }
@@ -534,81 +528,73 @@ function incidentReportAuthor(report) {
 // Render incident as a string
 function incidentAsString(incident) {
     if (incident.number == null) {
-        document.title = "New Incident";
-    } else {
-        return (
-            incident.event + " IMS #" + incident.number + ": " +
-            summarizeIncident(incident)
-        );
+        return "New Incident";
     }
+    return (
+        "IMS #" + incident.number + ": " +
+        summarizeIncident(incident)
+    );
 }
 
 
 // Render field report as a string
 function incidentReportAsString(report) {
     if (report.number == null) {
-        document.title = "New Field Report";
-    } else {
-        return (
-            "FR #" + report.number +
-            " (" + incidentReportAuthor(report) + "): " +
-            summarizeIncidentReport(report)
-        );
+        return "New Field Report";
     }
+    return (
+        "FR #" + report.number +
+        " (" + incidentReportAuthor(report) + "): " +
+        summarizeIncidentReport(report)
+    );
 }
 
 
 // Return all user-entered report text for a given incident.
 function reportTextFromIncident(incident) {
-    var texts = [];
+    const texts = [];
 
-    if (incident.summary != undefined) {
+    if (incident.summary != null) {
         texts.push(incident.summary);
     }
 
-    var reportEntries = incident.report_entries;
-
-    for (var i in reportEntries) {
-        var reportEntry = reportEntries[i];
+    for (const reportEntry of incident.report_entries??[]) {
 
         // Skip system entries
         if (reportEntry.system_entry) {
             continue;
         }
 
-        var text = reportEntry.text;
+        const text = reportEntry.text;
 
-        if (text != undefined) {
+        if (text != null) {
             texts.push(text);
         }
     }
 
     // Incidents page loads all field reports for the event
-    if (typeof eventIncidentReports !== "undefined") {
-        for (var i in incident.incident_reports) {
-            var reportNumber = incident.incident_reports[i];
-            var report = eventIncidentReports[reportNumber];
-            var reportText = reportTextFromIncident(report);
+    if (typeof eventIncidentReports !== "undefined" && incident.incident_reports) {
+        for (const reportNumber of incident.incident_reports) {
+            const report = eventIncidentReports[reportNumber];
+            const reportText = reportTextFromIncident(report);
 
             texts.push(reportText);
         }
     }
 
-    var text = texts.join("");
-
-    return text;
+    return texts.join("");
 }
 
 
 // Return a short description for a given location.
 function shortDescribeLocation(location) {
-    if (location == undefined) {
+    if (location == null) {
         return undefined;
     }
 
-    var locationBits = [];
+    const locationBits = [];
 
-    if (location.name != undefined) {
+    if (location.name != null) {
         locationBits.push(location.name);
     }
 
@@ -616,7 +602,7 @@ function shortDescribeLocation(location) {
         case undefined:
             // Fall through to "text" case
         case "text":
-            if (location.description != undefined) {
+            if (location.description != null) {
                 locationBits.push(" ");
                 locationBits.push(location.description);
             }
@@ -724,7 +710,7 @@ function renderDate(date, type, incident) {
 }
 
 function renderState(state, type, incident) {
-    if (state == undefined) {
+    if (state == null) {
         state = stateForIncident(incident);
     }
 
@@ -742,7 +728,7 @@ function renderState(state, type, incident) {
 }
 
 function renderLocation(data, type, incident) {
-    if (data == undefined) {
+    if (data == null) {
         data = "";
     }
     switch (type) {
@@ -779,7 +765,7 @@ function renderSummary(data, type, incident) {
 function reportEntryElement(entry) {
     // Build a container for the entry
 
-    var entryContainer = $("<div />", {"class": "report_entry"});
+    const entryContainer = $("<div />", {"class": "report_entry"});
 
     if (entry.system_entry) {
         entryContainer.addClass("report_entry_system");
@@ -793,18 +779,18 @@ function reportEntryElement(entry) {
 
     // Add the timestamp and author
 
-    metaDataContainer = $("<p />", {"class": "report_entry_metadata"})
+    const metaDataContainer = $("<p />", {"class": "report_entry_metadata"})
 
-    var timeStampContainer = timeElement(new Date(entry.created));
+    const timeStampContainer = timeElement(new Date(entry.created));
     timeStampContainer.addClass("report_entry_timestamp");
 
     metaDataContainer.append([timeStampContainer, ", "]);
 
-    var author = entry.author;
-    if (author == undefined) {
+    let author = entry.author;
+    if (author == null) {
         author = "(unknown)";
     }
-    var authorContainer = $("<span />");
+    const authorContainer = $("<span />");
     authorContainer.text(entry.author);
     authorContainer.addClass("report_entry_author");
 
@@ -813,11 +799,10 @@ function reportEntryElement(entry) {
     if (entry.merged) {
         metaDataContainer.append(" ");
 
-        var link = $("<a />");
+        const link = $("<a />");
         link.text("field report #" + entry.merged);
         link.attr("href", urlReplace(url_viewIncidentReports) + entry.merged)
 
-        var reportNumberContainer = $("<span />");
         metaDataContainer.append("(via ");
         metaDataContainer.append(link);
         metaDataContainer.append(")");
@@ -831,10 +816,10 @@ function reportEntryElement(entry) {
 
     // Add report text
 
-    var lines = entry.text.split("\n");
-    for (var i in lines) {
-        var textContainer = $("<p />", {"class": "report_entry_text"});
-        textContainer.text(lines[i]);
+    const lines = entry.text.split("\n");
+    for (const line of lines) {
+        const textContainer = $("<p />", {"class": "report_entry_text"});
+        textContainer.text(line);
 
         entryContainer.append(textContainer);
     }
@@ -848,12 +833,12 @@ function reportEntryElement(entry) {
 }
 
 function drawReportEntries(entries) {
-    var container = $("#incident_report");
+    const container = $("#incident_report");
     container.empty();
 
-    if (entries != undefined && entries.length > 0) {
-        for (var i in entries) {
-            container.append(reportEntryElement(entries[i]));
+    if (entries) {
+        for (const entry of entries) {
+            container.append(reportEntryElement(entry));
         }
         container.parent().parent().removeClass("hidden");
     } else {
@@ -862,14 +847,14 @@ function drawReportEntries(entries) {
 }
 
 function reportEntryEdited() {
-    var text = $("#incident_report_add").val().trim();
-    var submitButton = $("#report_entry_submit");
+    const text = $("#incident_report_add").val().trim();
+    const submitButton = $("#report_entry_submit");
 
     submitButton.removeClass("btn-default");
     submitButton.removeClass("btn-warning");
     submitButton.removeClass("btn-danger");
 
-    if (text == "") {
+    if (!text) {
         submitButton.addClass("disabled");
         submitButton.addClass("btn-default");
     } else {
@@ -880,9 +865,9 @@ function reportEntryEdited() {
 
 
 function submitReportEntry() {
-    var text = $("#incident_report_add").val().trim();
+    const text = $("#incident_report_add").val().trim();
 
-    if (text == "") {
+    if (!text) {
         return;
     }
 
@@ -898,7 +883,7 @@ function submitReportEntry() {
     }
 
     function fail() {
-        var submitButton = $("#report_entry_submit");
+        const submitButton = $("#report_entry_submit");
         submitButton.removeClass("btn-default");
         submitButton.removeClass("btn-warning");
         submitButton.addClass("btn-danger");
@@ -910,30 +895,30 @@ function submitReportEntry() {
 
 
 function editFromElement(element, jsonKey, transform) {
-    var value = element.val();
+    let value = element.val();
 
-    if (transform !== undefined) {
+    if (transform != null) {
         value = transform(value);
     }
 
     // Build a JSON object representing the requested edits
 
-    var edits = {};
+    const edits = {};
 
-    var keyPath = jsonKey.split(".");
-    var lastKey = keyPath.pop();
+    const keyPath = jsonKey.split(".");
+    const lastKey = keyPath.pop();
 
-    var current = edits;
-    for (var i in keyPath) {
-        var next = {};
-        current[keyPath[i]] = next;
+    let current = edits;
+    for (const path of keyPath) {
+        const next = {};
+        current[path] = next;
         current = next;
     }
     current[lastKey] = value;
 
     // Location must include type
 
-    if (edits.location !== undefined) {
+    if (edits.location != null) {
         edits.location.type = "garett";  // UI only supports one type
     }
 
diff --git a/src/ims/element/static/incident.js b/src/ims/element/static/incident.js
index 26790ad9f..d5a18b236 100644
--- a/src/ims/element/static/incident.js
+++ b/src/ims/element/static/incident.js
@@ -28,7 +28,7 @@ function initIncidentPage() {
         loadAndDisplayIncidentReports();
 
         // for a new incident
-        if (incident.number === null) {
+        if (incident.number == null) {
             $("#incident_summary").focus();
         } else {
             // Scroll to incident_report_add field
@@ -49,13 +49,13 @@ function initIncidentPage() {
         disableEditing();
         loadAndDisplayIncident(loadedIncident);
 
-        // Updates
+        // Updates...it's fine to ignore the returned promise here
         requestEventSourceLock();
 
         const incidentChannel = new BroadcastChannel(incidentChannelName);
         incidentChannel.onmessage = function (e) {
             const number = e.data;
-            if (number == incidentNumber) {
+            if (number === incidentNumber) {
                 console.log("Got incident update: " + number);
                 loadAndDisplayIncident();
                 loadAndDisplayIncidentReports();
@@ -64,13 +64,13 @@ function initIncidentPage() {
 
         // Keyboard shortcuts
 
-        var command = false;
+        let command = false;
 
         function addFieldKeyDown() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = true;
             }
 
@@ -78,16 +78,16 @@ function initIncidentPage() {
         }
 
         function addFieldKeyUp() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = false;
                 return;
             }
 
             // 13 = return
-            if (command && keyCode == 13) {
+            if (command && keyCode === 13) {
                 submitReportEntry();
             }
         }
@@ -104,10 +104,10 @@ function initIncidentPage() {
 // Load incident
 //
 
-var incident = null;
+let incident = null;
 
 function loadIncident(success) {
-    var number = null;
+    let number = null;
     if (incident == null) {
         // First time here.  Use page JavaScript initial value.
         number = incidentNumber;
@@ -119,14 +119,14 @@ function loadIncident(success) {
     function ok(data, status, xhr) {
         incident = data;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
         disableEditing();
-        var message = "Failed to load incident";
+        const message = "Failed to load incident";
         console.error(message + ": " + error);
         setErrorMessage(message);
     }
@@ -139,7 +139,7 @@ function loadIncident(success) {
             "summary": "",
         });
     } else {
-        var url = incidentsURL + number;
+        const url = incidentsURL + number;
         jsonRequest(url, null, ok, fail);
     }
 }
@@ -159,7 +159,7 @@ function clearErrorMessage() {
 function loadAndDisplayIncident(success) {
     function loaded() {
         if (incident == null) {
-            var message = "Incident failed to load";
+            const message = "Incident failed to load";
             console.log(message);
             setErrorMessage(message);
             return;
@@ -172,7 +172,7 @@ function loadAndDisplayIncident(success) {
             enableEditing();
         }
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
@@ -197,18 +197,17 @@ function loadAndDisplayIncidentReports() {
 // Load personnel
 //
 
-var personnel = null;
-
+let personnel = null;
 
 function loadPersonnelAndCache(success) {
-    var cached = localLoadPersonnel();
+    const cached = localLoadPersonnel();
 
     function loadedPersonnel() {
         localCachePersonnel(personnel);
         success();
     }
 
-    if (cached == undefined) {
+    if (cached == null) {
         loadPersonnel(loadedPersonnel);
     } else {
         personnel = cached;
@@ -219,10 +218,8 @@ function loadPersonnelAndCache(success) {
 
 function loadPersonnel(success) {
     function ok(data, status, xhr) {
-        var _personnel = {};
-        for (var i in data) {
-            var record = data[i];
-
+        const _personnel = {};
+        for (const record of data) {
             // Filter inactive Rangers out
             // FIXME: better yet: filter based on on-playa state
             switch (record.status) {
@@ -237,13 +234,13 @@ function loadPersonnel(success) {
         }
         personnel = _personnel
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load personnel";
+        const message = "Failed to load personnel";
         console.error(message + ": " + error);
         setErrorMessage(message);
     }
@@ -253,7 +250,7 @@ function loadPersonnel(success) {
 
 
 function localCachePersonnel(personnel) {
-    if (personnel == undefined) {
+    if (personnel == null) {
         alert("Attempt to cache undefined personnel")
         return;
     }
@@ -274,14 +271,14 @@ var incidentTypes = null;
 
 
 function loadIncidentTypesAndCache(success) {
-    var cached = localLoadIncidentTypes();
+    const cached = localLoadIncidentTypes();
 
     function loadedIncidentTypes() {
         localCacheIncidentTypes(incidentTypes);
         success();
     }
 
-    if (cached == undefined) {
+    if (cached == null) {
         loadIncidentTypes(loadedIncidentTypes);
     } else {
         incidentTypes = cached;
@@ -292,20 +289,20 @@ function loadIncidentTypesAndCache(success) {
 
 function loadIncidentTypes(success) {
     function ok(data, status, xhr) {
-        var _incidentTypes = [];
-        for (var i in data) {
-            _incidentTypes.push(data[i])
+        const _incidentTypes = [];
+        for (const record of data) {
+            _incidentTypes.push(record)
         }
         _incidentTypes.sort()
         incidentTypes = _incidentTypes
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load incident types";
+        const message = "Failed to load incident types";
         console.error(message + ": " + error);
         setErrorMessage(message);
     }
@@ -315,7 +312,7 @@ function loadIncidentTypes(success) {
 
 
 function localCacheIncidentTypes(incidentTypes) {
-    if (incidentTypes == undefined) {
+    if (incidentTypes == null) {
         alert("Attempt to cache undefined incident types")
         return;
     }
@@ -332,7 +329,7 @@ function localLoadIncidentTypes() {
 // Load unattached field reports
 //
 
-var unattachedIncidentReports = null;
+let unattachedIncidentReports = null;
 
 function loadUnattachedIncidentReports(success) {
     if (unattachedIncidentReports === undefined) {
@@ -351,17 +348,17 @@ function loadUnattachedIncidentReports(success) {
         })
         unattachedIncidentReports = _unattachedIncidentReports;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        if (xhr.status == 403) {
+        if (xhr.status === 403) {
             // We're not allowed to look these up.
             unattachedIncidentReports = undefined;
         } else {
-            var message = "Failed to load unattached field reports";
+            const message = "Failed to load unattached field reports";
             console.error(message + ": " + error);
             setErrorMessage(message);
         }
@@ -378,7 +375,7 @@ function loadUnattachedIncidentReports(success) {
 // Load attached field reports
 //
 
-var attachedIncidentReports = null;
+let attachedIncidentReports = null;
 
 function loadAttachedIncidentReports(success) {
     if (incidentNumber == null) {
@@ -388,18 +385,18 @@ function loadAttachedIncidentReports(success) {
     function ok(data, status, xhr) {
         attachedIncidentReports = data;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load attached field reports";
+        const message = "Failed to load attached field reports";
         console.error(message + ": " + error);
         setErrorMessage(message);
     }
 
-    var url = (
+    const url = (
         urlReplace(url_incidentReports) + "?incident=" + incidentNumber
     );
 
@@ -436,24 +433,24 @@ function drawIncidentFields() {
 //
 
 function addLocationAddressOptions() {
-    var hours = range(1, 13);
-    for (var i in hours) {
-        var hour = padTwo(hours[i]);
+    const hours = range(1, 13);
+    for (let hour of hours) {
+        hour = padTwo(hour);
         $("#incident_location_address_radial_hour")
             .append($("<option />", { "value": hour, "text": hour }))
             ;
     }
 
-    var minutes = range(0, 12, 5);
-    for (var i in minutes) {
-        var minute = padTwo(minutes[i]);
+    const minutes = range(0, 12, 5);
+    for (let minute of minutes) {
+        minute = padTwo(minute);
         $("#incident_location_address_radial_minute")
             .append($("<option />", { "value": minute, "text": minute }))
             ;
     }
 
-    for (var id in concentricStreetNameByID) {
-        var name = concentricStreetNameByID[id];
+    for (const id in concentricStreetNameByID) {
+        const name = concentricStreetNameByID[id];
         $("#incident_location_address_concentric")
             .append($("<option />", { "value": id, "text": name }))
             ;
@@ -475,7 +472,7 @@ function drawTitle() {
 //
 
 function drawNumber() {
-    var number = incident.number;
+    let number = incident.number;
     if (number == null) {
         number = "(new)";
     }
@@ -529,7 +526,7 @@ function drawSummary() {
 // Populate Rangers list
 //
 
-var _rangerItem = null;
+let _rangerItem = null;
 
 function drawRangers() {
     if (_rangerItem == null) {
@@ -538,40 +535,35 @@ function drawRangers() {
             ;
     }
 
-    var items = [];
+    const items = [];
 
-    var handles = incident.ranger_handles;
-    if (handles == undefined) {
-        handles = [];
-    } else {
-        handles.sort((a, b) => a.localeCompare(b));
-    }
+    const handles = incident.ranger_handles??[];
+    handles.sort((a, b) => a.localeCompare(b));
 
-    for (var i in handles) {
-        var handle = handles[i]
-        var ranger = null;
-        if (personnel == null || personnel[handle] == undefined) {
+    for (const handle of handles) {
+        let ranger = null;
+        if (personnel?.[handle] == null) {
             ranger = handle;
         } else {
             ranger = rangerAsString(personnel[handle]);
         }
-        var item = _rangerItem.clone();
+        const item = _rangerItem.clone();
         item.append(textAsHTML(ranger));
         item.attr("value", textAsHTML(handle));
         items.push(item);
     }
 
-    var container = $("#incident_rangers_list");
+    const container = $("#incident_rangers_list");
     container.empty();
     container.append(items);
 }
 
 
 function drawRangersToAdd() {
-    var datalist = $("#ranger_handles");
+    const datalist = $("#ranger_handles");
 
-    var handles = [];
-    for (var handle in personnel) {
+    const handles = [];
+    for (const handle in personnel) {
         handles.push(handle);
     }
     handles.sort((a, b) => a.localeCompare(b));
@@ -579,11 +571,10 @@ function drawRangersToAdd() {
     datalist.empty();
     datalist.append($("<option />"));
 
-    for (var i in handles) {
-        var handle = handles[i];
-        var ranger = personnel[handle];
+    for (const handle of handles) {
+        const ranger = personnel[handle];
 
-        var option = $("<option />");
+        const option = $("<option />");
         option.val(handle);
         option.text(rangerAsString(ranger));
 
@@ -593,13 +584,13 @@ function drawRangersToAdd() {
 
 
 function rangerAsString(ranger) {
-    var result = ranger.handle;
+    let result = ranger.handle;
 
-    if (ranger.name != undefined && ranger.name != null && ranger.name != "") {
+    if (ranger.name) {
         result += " (" + ranger.name + ")";
     }
 
-    if (ranger.status == "vintage") {
+    if (ranger.status === "vintage") {
         result += "*";
     }
 
@@ -611,7 +602,7 @@ function rangerAsString(ranger) {
 // Populate incident types list
 //
 
-var _typesItem = null;
+let _typesItem = null;
 
 function drawIncidentTypes() {
     if (_typesItem == null) {
@@ -620,38 +611,32 @@ function drawIncidentTypes() {
             ;
     }
 
-    var items = [];
+    const items = [];
 
-    var incidentTypes = incident.incident_types;
-    if (incidentTypes == undefined) {
-        incidentTypes = [];
-    } else {
-        incidentTypes.sort();
-    }
+    const incidentTypes = incident.incident_types??[];
+    incidentTypes.sort();
 
-    for (var i in incidentTypes) {
-        var item = _typesItem.clone();
-        item.attr("value", textAsHTML(incidentTypes[i]));
-        item.append(textAsHTML(incidentTypes[i]));
+    for (const incidentType of incidentTypes) {
+        const item = _typesItem.clone();
+        item.attr("value", textAsHTML(incidentType));
+        item.append(textAsHTML(incidentType));
         items.push(item);
     }
 
-    var container = $("#incident_types_list");
+    const container = $("#incident_types_list");
     container.empty();
     container.append(items);
 }
 
 
 function drawIncidentTypesToAdd() {
-    var datalist = $("#incident_types");
+    const datalist = $("#incident_types");
 
     datalist.empty();
     datalist.append($("<option />"));
 
-    for (var i in incidentTypes) {
-        var incidentType = incidentTypes[i];
-
-        var option = $("<option />");
+    for (const incidentType of incidentTypes) {
+        const option = $("<option />");
         option.val(incidentType);
 
         datalist.append(option);
@@ -664,20 +649,16 @@ function drawIncidentTypesToAdd() {
 //
 
 function drawLocationName() {
-    if (incident.location != undefined) {
-        if (incident.location.name != undefined) {
-            $("#incident_location_name").val(incident.location.name);
-        }
+    if (incident.location?.name) {
+        $("#incident_location_name").val(incident.location.name);
     }
 }
 
 
 function drawLocationAddressRadialHour() {
-    var hour = null;
-    if (incident.location != undefined) {
-        if (incident.location.radial_hour != undefined) {
-            hour = padTwo(incident.location.radial_hour);
-        }
+    let hour = null;
+    if (incident.location?.radial_hour != null) {
+        hour = padTwo(incident.location.radial_hour);
     }
     selectOptionWithValue(
         $("#incident_location_address_radial_hour"), hour
@@ -686,11 +667,9 @@ function drawLocationAddressRadialHour() {
 
 
 function drawLocationAddressRadialMinute() {
-    var minute = null;
-    if (incident.location != undefined) {
-        if (incident.location.radial_minute != undefined) {
-            minute = normalizeMinute(incident.location.radial_minute);
-        }
+    let minute = null;
+    if (incident.location?.radial_minute != null) {
+        minute = normalizeMinute(incident.location.radial_minute);
     }
     selectOptionWithValue(
         $("#incident_location_address_radial_minute"), minute
@@ -699,11 +678,9 @@ function drawLocationAddressRadialMinute() {
 
 
 function drawLocationAddressConcentric() {
-    var concentric = null;
-    if (incident.location != undefined) {
-        if (incident.location.concentric != undefined) {
-            concentric = incident.location.concentric;
-        }
+    let concentric = null;
+    if (incident.location?.concentric) {
+        concentric = incident.location.concentric;
     }
     selectOptionWithValue(
         $("#incident_location_address_concentric"), concentric
@@ -712,12 +689,10 @@ function drawLocationAddressConcentric() {
 
 
 function drawLocationDescription() {
-    if (incident.location != undefined) {
-        if (incident.location.description != undefined) {
-            $("#incident_location_description")
-                .val(incident.location.description)
-                ;
-        }
+    if (incident.location?.description) {
+        $("#incident_location_description")
+            .val(incident.location.description)
+            ;
     }
 }
 
@@ -740,18 +715,16 @@ function toggleShowHistory() {
 //
 
 function drawMergedReportEntries() {
-    var entries = [];
+    const entries = [];
 
     if (incident.report_entries) {
         $.merge(entries, incident.report_entries);
     }
 
-    if (attachedIncidentReports != null) {
+    if (attachedIncidentReports) {
         if ($("#merge_reports_checkbox").is(":checked")) {
-            for (var i in attachedIncidentReports) {
-                var report = attachedIncidentReports[i];
-                for (var j in report.report_entries) {
-                    var entry = report.report_entries[j];
+            for (const report of attachedIncidentReports) {
+                for (const entry of report.report_entries??[]) {
                     entry.merged = report.number;
                     entries.push(entry);
                 }
@@ -765,7 +738,7 @@ function drawMergedReportEntries() {
 }
 
 
-var _reportsItem = null;
+let _reportsItem = null;
 
 function drawAttachedIncidentReports() {
     if (_reportsItem == null) {
@@ -774,19 +747,14 @@ function drawAttachedIncidentReports() {
             ;
     }
 
-    var items = [];
+    const items = [];
 
-    var reports = attachedIncidentReports;
-    if (reports == undefined) {
-        reports = [];
-    } else {
-        reports.sort();
-    }
+    const reports = attachedIncidentReports??[];
+    reports.sort();
 
-    for (var i in reports) {
-        var report = reports[i];
-        var item = _reportsItem.clone();
-        var link = $("<a />");
+    for (const report of reports) {
+        const item = _reportsItem.clone();
+        const link = $("<a />");
         link.attr("href", urlReplace(url_viewIncidentReports) + report.number);
         link.text(incidentReportAsString(report));
         item.append(link);
@@ -794,20 +762,20 @@ function drawAttachedIncidentReports() {
         items.push(item);
     }
 
-    var container = $("#attached_incident_reports");
+    const container = $("#attached_incident_reports");
     container.empty();
     container.append(items);
 }
 
 
 function drawIncidentReportsToAttach() {
-    var container = $("#attached_incident_report_add_container");
-    var select = $("#attached_incident_report_add");
+    const container = $("#attached_incident_report_add_container");
+    const select = $("#attached_incident_report_add");
 
     select.empty();
     select.append($("<option />"));
 
-    if (unattachedIncidentReports.length == 0) {
+    if (!unattachedIncidentReports) {
         container.addClass("hidden");
     } else {
 
@@ -849,15 +817,14 @@ function drawIncidentReportsToAttach() {
 //
 
 function sendEdits(edits, success, error) {
-    var number = incident.number
-    var url = incidentsURL;
+    const number = incident.number;
+    let url = incidentsURL;
 
     if (number == null) {
         // We're creating a new incident.
-        var required = ["state", "priority"];
-        for (var i in required) {
-            var key = required[i];
-            if (edits[key] == undefined) {
+        const required = ["state", "priority"];
+        for (const key of required) {
+            if (edits[key] == null) {
                 edits[key] = incident[key];
             }
         }
@@ -873,7 +840,7 @@ function sendEdits(edits, success, error) {
             // We need to find out the create incident number so that future
             // edits don't keep creating new resources.
 
-            newNumber = xhr.getResponseHeader("X-IMS-Incident-Number")
+            let newNumber = xhr.getResponseHeader("X-IMS-Incident-Number")
             // Check that we got a value back
             if (newNumber == null) {
                 fail("No X-IMS-Incident-Number header provided.", status, xhr);
@@ -905,7 +872,7 @@ function sendEdits(edits, success, error) {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to apply edit";
+        const message = "Failed to apply edit";
         console.log(message + ": " + requestError);
         error();
         loadAndDisplayIncident();
@@ -937,7 +904,7 @@ function editLocationName() {
 
 
 function transformAddressInteger(value) {
-    if (value == "") {
+    if (!value) {
         return null;
     }
     return parseInt(value);
@@ -979,7 +946,7 @@ function editLocationDescription() {
 function removeRanger(sender) {
     sender = $(sender);
 
-    var rangerHandle = sender.parent().attr("value");
+    const rangerHandle = sender.parent().attr("value");
 
     function ok() {
         // FIXME
@@ -994,7 +961,7 @@ function removeRanger(sender) {
     sendEdits(
         {
             "ranger_handles": incident.ranger_handles.filter(
-                function(h) { return h != rangerHandle }
+                function(h) { return h !== rangerHandle }
             ),
         },
         ok, fail
@@ -1020,7 +987,7 @@ function removeIncidentType(sender) {
     sendEdits(
         {
             "incident_types": incident.incident_types.filter(
-                function(t) { return t != incidentType }
+                function(t) { return t !== incidentType }
             ),
         },
         ok, fail
@@ -1032,22 +999,18 @@ function normalize(str) {
 }
 
 function addRanger() {
-    var select = $("#ranger_add");
-    var handle = $(select).val();
-    var handles = incident.ranger_handles;
+    const select = $("#ranger_add");
+    let handle = $(select).val();
 
-    if (handles == undefined) {
-        handles = [];
-    } else {
-        handles = handles.slice();  // copy
-    }
+    // make a copy of the handles
+    const handles = (incident.ranger_handles??[]).slice();
 
     // fuzzy-match on handle, to allow case insensitivity and
     // leading/trailing whitespace.
     if (!(handle in personnel)) {
         const normalized = normalize(handle);
         for (const validHandle in personnel) {
-            if (normalized == normalize(validHandle)) {
+            if (normalized === normalize(validHandle)) {
                 handle = validHandle;
                 break;
             }
@@ -1059,7 +1022,7 @@ function addRanger() {
         return;
     }
 
-    if (handles.indexOf(handle) != -1) {
+    if (handles.indexOf(handle) !== -1) {
         // Already in the list, so… move along.
         select.val("");
         return;
@@ -1082,34 +1045,30 @@ function addRanger() {
 
 
 function addIncidentType() {
-    var select = $("#incident_type_add");
-    var incidentType = $(select).val();
-    var currentIncidentTypes = incident.incident_types
+    const select = $("#incident_type_add");
+    let incidentType = $(select).val();
 
-    if (currentIncidentTypes == undefined) {
-        currentIncidentTypes = [];
-    } else {
-        currentIncidentTypes = currentIncidentTypes.slice();  // copy
-    }
+    // make a copy of the incident types
+    const currentIncidentTypes = (incident.incident_types??[]).slice();
 
     // fuzzy-match on incidentType, to allow case insensitivity and
     // leading/trailing whitespace.
-    if (incidentTypes.indexOf(incidentType) == -1) {
+    if (incidentTypes.indexOf(incidentType) === -1) {
         const normalized = normalize(incidentType);
         for (const validType of incidentTypes) {
-            if (normalized == normalize(validType)) {
+            if (normalized === normalize(validType)) {
                 incidentType = validType;
                 break;
             }
         }
     }
-    if (incidentTypes.indexOf(incidentType) == -1) {
+    if (incidentTypes.indexOf(incidentType) === -1) {
         // Not a valid incident type
         select.val("");
         return;
     }
 
-    if (currentIncidentTypes.indexOf(incidentType) != -1) {
+    if (currentIncidentTypes.indexOf(incidentType) !== -1) {
         // Already in the list, so… move along.
         select.val("");
         return;
@@ -1134,7 +1093,7 @@ function addIncidentType() {
 function detachIncidentReport(sender) {
     sender = $(sender);
 
-    var incidentReport = sender.parent().data();
+    const incidentReport = sender.parent().data();
 
     function ok(data, status, xhr) {
         // FIXME
@@ -1146,13 +1105,13 @@ function detachIncidentReport(sender) {
         // FIXME
         // controlHasError(sender);
 
-        var message = "Failed to detach field report";
+        const message = "Failed to detach field report";
         console.log(message + ": " + requestError);
         loadAndDisplayIncidentReports();
         setErrorMessage(message);
     }
 
-    var url = (
+    const url = (
         urlReplace(url_incidentReports) + incidentReport.number +
         "?action=detach;incident=" + incidentNumber
     );
@@ -1168,8 +1127,8 @@ function attachIncidentReport() {
         return;
     }
 
-    var select = $("#attached_incident_report_add");
-    var incidentReportNumber = $(select).val();
+    const select = $("#attached_incident_report_add");
+    const incidentReportNumber = $(select).val();
 
     function ok(data, status, xhr) {
         loadAndDisplayIncidentReports();
@@ -1177,14 +1136,14 @@ function attachIncidentReport() {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to attach field report";
+        const message = "Failed to attach field report";
         console.log(message + ": " + requestError);
         loadAndDisplayIncidentReports();
         setErrorMessage(message);
         controlHasError(select);
     }
 
-    var url = (
+    const url = (
         urlReplace(url_incidentReports) + incidentReportNumber +
         "?action=attach;incident=" + incidentNumber
     );
diff --git a/src/ims/element/static/incident_report.js b/src/ims/element/static/incident_report.js
index 50441bb79..638cce773 100644
--- a/src/ims/element/static/incident_report.js
+++ b/src/ims/element/static/incident_report.js
@@ -16,12 +16,12 @@
 
 //
 // Initialize UI
-//
+let incidentReport = null;
 
 function initIncidentReportPage() {
     function loadedIncidentReport() {
         // for a new incident report
-        if (incidentReport.number === null) {
+        if (incidentReport.number == null) {
             $("#incident_report_summary").focus();
         } else {
             // Scroll to incident_report_add field
@@ -41,13 +41,13 @@ function initIncidentReportPage() {
         disableEditing();
         loadAndDisplayIncidentReport(loadedIncidentReport);
 
-        var command = false;
+        let command = false;
 
         function addFieldKeyDown() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = true;
             }
 
@@ -55,16 +55,16 @@ function initIncidentReportPage() {
         }
 
         function addFieldKeyUp() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = false;
                 return;
             }
 
             // 13 = return
-            if (command && keyCode == 13) {
+            if (command && keyCode === 13) {
                 submitReportEntry();
             }
         }
@@ -93,10 +93,8 @@ function clearErrorMessage() {
 // Load incident report
 //
 
-var incidentReport = null;
-
 function loadIncidentReport(success) {
-    var number = null;
+    let number = null;
     if (incidentReport == null) {
         // First time here.  Use page JavaScript initial value.
         number = incidentReportNumber;
@@ -108,14 +106,14 @@ function loadIncidentReport(success) {
     function ok(data, status, xhr) {
         incidentReport = data;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
         disableEditing();
-        var message = "Failed to load field report";
+        const message = "Failed to load field report";
         console.error(message + ": " + error);
         setErrorMessage(message);
     }
@@ -126,7 +124,7 @@ function loadIncidentReport(success) {
             "created": null,
         });
     } else {
-        var url = urlReplace(url_incidentReports) + number;
+        const url = urlReplace(url_incidentReports) + number;
         jsonRequest(url, null, ok, fail);
     }
 }
@@ -135,7 +133,7 @@ function loadIncidentReport(success) {
 function loadAndDisplayIncidentReport(success) {
     function loaded() {
         if (incidentReport == null) {
-            var message = "Field report failed to load";
+            const message = "Field report failed to load";
             console.log(message);
             setErrorMessage(message);
             return;
@@ -154,7 +152,7 @@ function loadAndDisplayIncidentReport(success) {
             enableEditing();
         }
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
@@ -177,7 +175,7 @@ function drawTitle() {
 //
 
 function drawNumber() {
-    var number = incidentReport.number;
+    let number = incidentReport.number;
     if (number == null) {
         number = "(new)";
     }
@@ -203,7 +201,7 @@ function drawIncident() {
     }
     // If there's no attached Incident, show a button for making
     // a new Incident
-    if (incidentReport.incident === null && canWriteIncidents) {
+    if (incidentReport.incident == null && canWriteIncidents) {
         $("#create_incident").removeClass("hidden");
     } else {
         $("#create_incident").addClass("hidden");
@@ -236,15 +234,14 @@ function drawSummary() {
 //
 
 function sendEdits(edits, success, error) {
-    var number = incidentReport.number
-    var url = urlReplace(url_incidentReports);
+    const number = incidentReport.number;
+    let url = urlReplace(url_incidentReports);
 
     if (number == null) {
         // We're creating a new field report.
-        var required = [];
-        for (var i in required) {
-            var key = required[i];
-            if (edits[key] == undefined) {
+        const required = [];
+        for (const key of required) {
+            if (edits[key] == null) {
                 edits[key] = incidentReport[key];
             }
         }
@@ -260,7 +257,7 @@ function sendEdits(edits, success, error) {
             // We need to find out the created field report number so that
             // future edits don't keep creating new resources.
 
-            newNumber = xhr.getResponseHeader("X-IMS-Incident-Report-Number")
+            let newNumber = xhr.getResponseHeader("X-IMS-Incident-Report-Number")
             // Check that we got a value back
             if (newNumber == null) {
                 fail(
@@ -297,7 +294,7 @@ function sendEdits(edits, success, error) {
     }
 
     function fail(requestError, status, xhr) {
-        var message = "Failed to apply edit";
+        const message = "Failed to apply edit";
         console.log(message + ": " + requestError);
         error();
         loadAndDisplayIncidentReport();
diff --git a/src/ims/element/static/incident_reports.js b/src/ims/element/static/incident_reports.js
index 806d65b3f..97b198607 100644
--- a/src/ims/element/static/incident_reports.js
+++ b/src/ims/element/static/incident_reports.js
@@ -22,13 +22,13 @@ function initIncidentReportsPage() {
         disableEditing();
         initIncidentReportsTable();
 
-        var command = false;
+        let command = false;
 
         function addFieldKeyDown() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = true;
             }
 
@@ -36,15 +36,15 @@ function initIncidentReportsPage() {
         }
 
         function addFieldKeyUp() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = false;
                 return;
             }
 
-            if (command && keyCode == 78) {
+            if (command && keyCode === 78) {
                 $("#new_incident_report").click();
             }
 
@@ -63,7 +63,7 @@ function initIncidentReportsPage() {
 // Dispatch queue table
 //
 
-var incidentReportsTable = null;
+let incidentReportsTable = null;
 
 function initIncidentReportsTable() {
     initDataTables();
@@ -76,6 +76,7 @@ function initIncidentReportsTable() {
         enableEditing();
     }
 
+    // it's ok to ignore the returned promise
     requestEventSourceLock();
     const incidentReportChannel = new BroadcastChannel(incidentReportChannelName);
     incidentReportChannel.onmessage = function (e) {
@@ -132,7 +133,7 @@ function initDataTables() {
                 // There are times we do two table refreshes in quick succession, and in
                 // those cases, the first call gets aborted. We don't want to set an error
                 // messages in those cases.
-                if (error == "abort") {
+                if (error === "abort") {
                     return;
                 }
                 let errMsg = "";
@@ -181,7 +182,7 @@ function initDataTables() {
         ],
         "createdRow": function (row, incidentReport, index) {
             $(row).click(function () {
-                var url = (
+                const url = (
                     urlReplace(url_viewIncidentReports) + incidentReport.number
                 );
 
@@ -246,8 +247,8 @@ function initSearch() {
         }
 
         // needs to use native comparison
-      for (var i in incidentReport.report_entries) {
-          if (timestamp < Date.parse(incidentReport.report_entries[i].created)) {
+      for (const entry of incidentReport.report_entries??[]) {
+          if (timestamp < Date.parse(entry.created)) {
               return true;
           }
       }
@@ -257,7 +258,7 @@ function initSearch() {
 
     $.fn.dataTable.ext.search.push(
         function(settings, rowData, rowIndex) {
-            var incidentReport = incidentReportsTable.data()[rowIndex];
+            const incidentReport = incidentReportsTable.data()[rowIndex];
 
             if (
                 _showModifiedAfter != null &&
@@ -276,16 +277,16 @@ function initSearch() {
 // Show days button handling
 //
 
-var _showModifiedAfter = null;
+let _showModifiedAfter = null;
 
 function showDays(daysBackToShow) {
-    var id = (daysBackToShow == null) ? "all": daysBackToShow.toString();
+    const id = (daysBackToShow == null) ? "all" : daysBackToShow.toString();
 
-    var menu = $("#show_days");
-    var item = $("#show_days_" + id);
+    const menu = $("#show_days");
+    const item = $("#show_days_" + id);
 
     // Get title from selected item
-    var selection = item.children(".name").html();
+    const selection = item.children(".name").html();
 
     // Update menu title to reflect selected item
     menu.children(".selection").html(selection);
@@ -310,13 +311,13 @@ function showDays(daysBackToShow) {
 //
 
 function showRows(rowsToShow) {
-    var id = (rowsToShow == null) ? "all": rowsToShow.toString();
+    const id = (rowsToShow == null) ? "all" : rowsToShow.toString();
 
-    var menu = $("#show_rows");
-    var item = $("#show_rows_" + id);
+    const menu = $("#show_rows");
+    const item = $("#show_rows_" + id);
 
     // Get title from selected item
-    var selection = item.children(".name").html();
+    const selection = item.children(".name").html();
 
     // Update menu title to reflect selected item
     menu.children(".selection").html(selection);
diff --git a/src/ims/element/static/incidents.js b/src/ims/element/static/incidents.js
index a50d7359c..4cf389221 100644
--- a/src/ims/element/static/incidents.js
+++ b/src/ims/element/static/incidents.js
@@ -22,13 +22,13 @@ function initIncidentsPage() {
         disableEditing();
         loadEventIncidentReports(initIncidentsTable);
 
-        var command = false;
+        let command = false;
 
         function addFieldKeyDown() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = true;
             }
 
@@ -36,15 +36,15 @@ function initIncidentsPage() {
         }
 
         function addFieldKeyUp() {
-            var keyCode = event.keyCode;
+            const keyCode = event.keyCode;
 
             // 17 = control, 18 = option
-            if (keyCode == 17 || keyCode == 18) {
+            if (keyCode === 17 || keyCode === 18) {
                 command = false;
                 return;
             }
 
-            if (command && keyCode == 78) {
+            if (command && keyCode === 78) {
                 $("#new_incident").click();
             }
 
@@ -66,26 +66,25 @@ function initIncidentsPage() {
 // We do this fetch in order to make incidents searchable by text in their
 // attached field reports.
 
-var eventIncidentReports = null;
+let eventIncidentReports = null;
 
 function loadEventIncidentReports(success) {
     function ok(data, status, xhr) {
-        var reports = {};
+        const reports = {};
 
-        for (var i in data) {
-            var report = data[i];
+        for (const report of data) {
             reports[report.number] = report;
         }
 
         eventIncidentReports = reports;
 
-        if (success != undefined) {
+        if (success) {
             success();
         }
     }
 
     function fail(error, status, xhr) {
-        var message = "Failed to load event field reports";
+        const message = "Failed to load event field reports";
         console.error(message + ": " + error);
         setErrorMessage(message);
     }
@@ -114,7 +113,7 @@ function clearErrorMessage() {
 // Dispatch queue table
 //
 
-var incidentsTable = null;
+let incidentsTable = null;
 
 function initIncidentsTable() {
     initDataTables();
@@ -127,6 +126,7 @@ function initIncidentsTable() {
         enableEditing();
     }
 
+    // ok to ignore returned Promise...have the tab wait for the lock
     requestEventSourceLock();
     const incidentChannel = new BroadcastChannel(incidentChannelName);
     incidentChannel.onmessage = function (e) {
@@ -168,7 +168,7 @@ function initDataTables() {
                 // There are times we do two table refreshes in quick succession, and in
                 // those cases, the first call gets aborted. We don't want to set an error
                 // messages in those cases.
-                if (error == "abort") {
+                if (error === "abort") {
                     return;
                 }
                 let errMsg = "";
@@ -249,7 +249,7 @@ function initDataTables() {
         ],
         "createdRow": function (row, incident, index) {
             $(row).click(function () {
-                var url = viewIncidentsURL + incident.number;
+                const url = viewIncidentsURL + incident.number;
 
                 // Open new context with link
                 window.open(
@@ -326,8 +326,8 @@ function initSearch() {
             return true;
         }
 
-        for (var i in incident.report_entries) {
-            if (timestamp < Date.parse(incident.report_entries[i].created)) {
+        for (const entry of incident.report_entries??[]) {
+            if (timestamp < Date.parse(entry.created)) {
                 return true;
             }
         }
@@ -337,20 +337,20 @@ function initSearch() {
 
     $.fn.dataTable.ext.search.push(
         function(settings, rowData, rowIndex) {
-            var incident = incidentsTable.data()[rowIndex];
-
+            const incident = incidentsTable.data()[rowIndex];
+            let state;
             switch (_showState) {
                 case "all":
                     break;
                 case "active":
                     state = stateForIncident(incident);
-                    if (state == "on_hold" || state == "closed") {
+                    if (state === "on_hold" || state === "closed") {
                         return false;
                     }
                     break;
                 case "open":
                     state = stateForIncident(incident);
-                    if (state == "closed") {
+                    if (state === "closed") {
                         return false;
                     }
                     break;
@@ -388,14 +388,14 @@ function initSearch() {
 // Show state button handling
 //
 
-var _showState = null;
+let _showState = null;
 
 function showState(stateToShow) {
-    var menu = $("#show_state");
-    var item = $("#show_state_" + stateToShow);
+    const menu = $("#show_state");
+    const item = $("#show_state_" + stateToShow);
 
     // Get title from selected item
-    var selection = item.children(".name").html();
+    const selection = item.children(".name").html();
 
     // Update menu title to reflect selected item
     menu.children(".selection").html(selection);
@@ -410,16 +410,16 @@ function showState(stateToShow) {
 // Show days button handling
 //
 
-var _showModifiedAfter = null;
+let _showModifiedAfter = null;
 
 function showDays(daysBackToShow) {
-    var id = (daysBackToShow == null) ? "all": daysBackToShow.toString();
+    const id = (daysBackToShow == null) ? "all" : daysBackToShow.toString();
 
-    var menu = $("#show_days");
-    var item = $("#show_days_" + id);
+    const menu = $("#show_days");
+    const item = $("#show_days_" + id);
 
     // Get title from selected item
-    var selection = item.children(".name").html();
+    const selection = item.children(".name").html();
 
     // Update menu title to reflect selected item
     menu.children(".selection").html(selection);
@@ -470,13 +470,13 @@ function showType(typeToShow) {
 //
 
 function showRows(rowsToShow) {
-    var id = (rowsToShow == null) ? "all": rowsToShow.toString();
+    const id = (rowsToShow == null) ? "all" : rowsToShow.toString();
 
-    var menu = $("#show_rows");
-    var item = $("#show_rows_" + id);
+    const menu = $("#show_rows");
+    const item = $("#show_rows_" + id);
 
     // Get title from selected item
-    var selection = item.children(".name").html();
+    const selection = item.children(".name").html();
 
     // Update menu title to reflect selected item
     menu.children(".selection").html(selection);