LAD Updates

src/injectscripts/all.js

@@ -133,6 +133,9 @@ whenWeAreReady(function () {
     <a href="#" id="LHClearStorage">Delete All Collections</a>\
     </li>\
     <li>\
+    <a href="http://lighthouse.ses.nsw.gov.au/guides.html">User Guides</a>\
+    </li>\
+    <li>\
     <a href="http://lighthouse.ses.nsw.gov.au">About Lighthouse</a>\
     </li>\
     </ul>\
@@ -178,18 +181,6 @@ whenWeAreReady(function () {
         unitName +
         ' Today)</a>\
     </li>\
-    <li role="presentation" class="divider"></li><li role="presentation" class="dropdown-header">Tasking\
-    </li>\
-    <li id="lhtaskingmenuitem">\
-    <a href="' +
-        lighthouseUrl +
-        'pages/tasking.html' +
-        vars +
-        '" target="_blank">Lighthouse Aided Dispatch (LAD!)</a>\
-    </li>\
-    <li id="lhtaskingremoteregister">\
-    <a href="">Register Tab For Remote Control</a>\
-    </li>\
     <li role="presentation" class="divider"></li><li role="presentation" class="dropdown-header">Teams\
     </li>\
     <li id="lhteammenuitem">\
@@ -207,7 +198,10 @@ whenWeAreReady(function () {
     <a href="#" id="LHClearStorage">Delete All Collections</a>\
     </li>\
     <li>\
-    <a href="https://github.com/NSWSESMembers/Lighthouse/blob/master/README.md">About Lighthouse</a>\
+    <a href="http://lighthouse.ses.nsw.gov.au/guides.html">User Guides</a>\
+    </li>\
+    <li>\
+    <a href="http://lighthouse.ses.nsw.gov.au">About Lighthouse</a>\
     </li>\
     </ul>\
     </li>\

src/pages/lib/shared_token_code.js

@@ -1,128 +1,89 @@
 var $ = require('jquery');
 var moment = require('moment');
-var periodicCheck = null
+var periodicCheck = null;
 
 // wait for token to have loaded
-export function fetchBeaconToken(apiHost, source, cb) { //when external vars have loaded
-  var waiting = setInterval(function () { //run every 1sec until we have loaded the page (dont hate me Sam)
+export function fetchBeaconToken(apiHost, source, cb) {
+  const waiting = setInterval(function () {
     chrome.storage.local.get('beaconAPIToken-' + apiHost, function (data) {
-      var tokenJSON = JSON.parse(data['beaconAPIToken-' + apiHost])
-      if (typeof tokenJSON.token !== "undefined" && typeof tokenJSON.expdate !== "undefined" && tokenJSON.token != '' && tokenJSON.expdate != '') {
-        var token = tokenJSON.token
-        var tokenexp = tokenJSON.expdate
-        clearInterval(waiting); //stop timer
+      const tokenJSON = JSON.parse(data['beaconAPIToken-' + apiHost]);
+      if (tokenJSON?.token && tokenJSON?.expdate) {
+        const { token, expdate: tokenexp } = tokenJSON;
+        clearInterval(waiting); // stop timer
 
-        if (periodicCheck == null) {
-          periodicCheck = setInterval(function () {
-            validateBeaconToken(apiHost, source)
-          }, 3e5);
-        }
-
-        cb({
-          token,
-          tokenexp
-        }); //call back
+        startTokenValidation(apiHost, source, cb); // Start periodic validation
+        cb({ token, tokenexp }); // callback with token
       }
-    })
+    });
   }, 200);
 }
 
-// wait for token to have loaded
-export function fetchBeaconTokenAndKeepReturningValidTokens(apiHost, source, cb) { //when external vars have loaded
-  var waiting = setInterval(function () { //run every 1sec until we have loaded the page (dont hate me Sam)
+// wait for token to have loaded and keep returning valid tokens
+export function fetchBeaconTokenAndKeepReturningValidTokens(apiHost, source, cb) {
+  const waiting = setInterval(function () {
     chrome.storage.local.get('beaconAPIToken-' + apiHost, function (data) {
-      var tokenJSON = JSON.parse(data['beaconAPIToken-' + apiHost])
-      if (typeof tokenJSON.token !== "undefined" && typeof tokenJSON.expdate !== "undefined" && tokenJSON.token != '' && tokenJSON.expdate != '') {
-        var token = tokenJSON.token
-        var tokenexp = tokenJSON.expdate
-        clearInterval(waiting); //stop timer
+      const tokenJSON = JSON.parse(data['beaconAPIToken-' + apiHost]);
+      if (tokenJSON?.token && tokenJSON?.expdate) {
+        const { token, expdate: tokenexp } = tokenJSON;
+        clearInterval(waiting); // stop timer
 
-        if (periodicCheck == null) {
-          periodicCheck = setInterval(function () {
-            validateBeaconTokenKeepReturning(apiHost, source, cb)
-          }, 1 * 60 * 1000); // 1 minute
-        }
-
-        cb({
-          token,
-          tokenexp
-        }); //call back
+        startTokenValidation(apiHost, source, cb); // Start periodic validation
+        cb({ token, tokenexp }); // callback with token
       }
-    })
+    });
   }, 200);
 }
 
-function validateBeaconTokenKeepReturning(apiHost, source, cb) {
-  fetchBeaconToken(apiHost, source, function ({
-    token,
-    tokenexp
-  }) {
-    if (moment().isAfter(moment(tokenexp).subtract(5, "minutes"))) {
-      console.log("token expiry triggered. time to renew.")
-      $.ajax({
-        type: 'GET',
-        url: source + "/Authorization/RefreshToken",
-        beforeSend: function (n) {
-          n.setRequestHeader("Authorization", "Bearer " + token)
-        },
-        cache: false,
-        dataType: 'json',
-        complete: function (response, _textStatus) {
-          var token = response.responseJSON.access_token
-          var tokenexp = response.responseJSON.expires_at
-          chrome.storage.local.set({
-            ['beaconAPIToken-' + apiHost]: JSON.stringify({
-              token: token,
-              expdate: tokenexp
-            })
-          }, function () {
-            console.log('local data set - beaconAPIToken')
-            cb({
-              token,
-              tokenexp
-            }); //call back again
-          })
-          console.log("successful token renew.")
+// Start a single periodic token validation timer
+function startTokenValidation(apiHost, source, cb) {
+  if (periodicCheck != null) return; // Avoid multiple timers
+
+  periodicCheck = setInterval(function () {
+    chrome.storage.local.get('beaconAPIToken-' + apiHost, function (data) {
+      const tokenJSON = JSON.parse(data['beaconAPIToken-' + apiHost]);
+      if (tokenJSON?.token && tokenJSON?.expdate) {
+        const { token, expdate: tokenexp } = tokenJSON;
+
+        if (moment().isAfter(moment(tokenexp).subtract(5, "minutes"))) {
+          renewToken(apiHost, source, token, cb);
+        } else {
+          console.log('API token still valid');
         }
-      })
-    } else {
-      console.log('api token still valid')
-    }
-  })
+      }
+    });
+  }, 1 * 60 * 1000); // Check every 1 minute
 }
 
-
-export function validateBeaconToken(apiHost, source) {
-  fetchBeaconToken(apiHost, source, function ({
-    token,
-    tokenexp
-  }) {
-    if (moment().isAfter(moment(tokenexp).subtract(5, "minutes"))) {
-      console.log("token expiry triggered. time to renew.")
-      $.ajax({
-        type: 'GET',
-        url: source + "/Authorization/RefreshToken",
-        beforeSend: function (n) {
-          n.setRequestHeader("Authorization", "Bearer " + token)
-        },
-        cache: false,
-        dataType: 'json',
-        complete: function (response, _textStatus) {
-          var token = response.responseJSON.access_token
-          var tokenexp = response.responseJSON.expires_at
-          chrome.storage.local.set({
-            ['beaconAPIToken-' + apiHost]: JSON.stringify({
-              token: token,
-              expdate: tokenexp
-            })
-          }, function () {
-            console.log('local data set - beaconAPIToken')
+// Renew the token
+function renewToken(apiHost, source, token, cb) {
+  console.log("Token expiry triggered. Attempting to renew.");
+  $.ajax({
+    type: 'GET',
+    url: source + "/Authorization/RefreshToken",
+    beforeSend: function (n) {
+      n.setRequestHeader("Authorization", "Bearer " + token);
+    },
+    cache: false,
+    dataType: 'json',
+    complete: function (response, _textStatus) {
+      if (response.status === 200 && response.responseJSON) {
+        const newToken = response.responseJSON.access_token;
+        const newTokenExp = response.responseJSON.expires_at;
+        chrome.storage.local.set({
+          ['beaconAPIToken-' + apiHost]: JSON.stringify({
+            token: newToken,
+            expdate: newTokenExp
           })
-          console.log("successful token renew.")
-        }
-      })
-    } else {
-      console.log('api token still valid')
+        }, function () {
+          console.log('Local data set - beaconAPIToken');
+          cb({ token: newToken, tokenexp: newTokenExp }); // callback with new token
+        });
+        console.log("Successful token renewal.");
+      } else {
+        console.error("Token renewal failed. Stopping further attempts.");
+        clearInterval(periodicCheck); // Stop further attempts
+        periodicCheck = null;
+      }
     }
-  })
+  });
 }

src/pages/tasking/components/asset_popup.js

@@ -99,17 +99,17 @@ export function buildAssetPopupKO() {
 
   <!-- Action buttons -->
   <div class="btn-group btn-group-sm ms-1" role="group">
-    <button class="btn btn-outline-secondary"
-            title="Focus on job"
-            data-bind="click: $root.safeJobFocus,
-                       disable: !hasJob(),
-                       clickBubble:false">
-      <i class="fa fa-crosshairs"></i>
+    <button type="button" class="btn btn-small btn-outline-secondary" title="Route to Job" data-bind="click: $root.drawRouteToJob, disable: !tsk.hasJob(), clickBubble: false">
+        <!-- ko ifnot: $root.routeLoading -->
+        <i class="fa fa-solid fa-car"></i>
+        <!-- /ko -->
+        <!-- ko if: $root.routeLoading -->
+        <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+        <!-- /ko -->
     </button>
-
     <button class="btn btn-outline-secondary"
             title="Open in Beacon"
-            data-bind="click: $root.safeJobOpen,
+            data-bind="click: job.openBeaconJobDetails,
                        disable: !hasJob(),
                        clickBubble:false">
       <i class="fa fa-external-link-alt"></i>
@@ -129,7 +129,7 @@ export function buildAssetPopupKO() {
         </div>
 
         <!-- Divider between teams -->
-        <hr class="my-2" data-bind="visible: $index() < ($parent.matchingTeams().length - 1)"/>
+        <hr class="my-2" data-bind="visible: $index() < ($parent.matchingTeamsInView().length - 1)"/>
       </div>
     </div>
   </div>`;

src/pages/tasking/components/job_popup.js

@@ -139,7 +139,12 @@ export function buildJobPopupKO() {
                   <button type="button" class="btn btn-small btn-outline-secondary"
                       title="Route to Asset"
                       data-bind="click: $root.drawRouteToAsset, disable: !team.trackableAndIsFiltered(), clickBubble: false">
+                      <!-- ko if: !$root.routeLoading() -->
                       <i class="fa fa-solid fa-car"></i>
+                      <!-- /ko -->
+                      <!-- ko if: $root.routeLoading() -->
+                      <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                      <!-- /ko -->
                   </button>
                   <button type="button" class="btn btn-small btn-outline-secondary"
                       title="Fit Bounds"

src/pages/tasking/main.js

@@ -23,6 +23,7 @@ import { CreateOpsLogModalVM } from "./viewmodels/OpsLogModalVM.js";
 import { CreateRadioLogModalVM } from "./viewmodels/RadioLogModalVM.js";
 import { SendSMSModalVM } from "./viewmodels/SMSTeamModalVM.js";
 import { JobStatusConfirmModalVM } from "./viewmodels/JobStatusConfirmModalVM.js";
+import { TrackableAssetsModalVM } from "./viewmodels/TrackableAssetsModalVM.js";
 
 import { installAlerts } from './components/alerts.js';
 import { LegendControl } from './components/legend.js';
@@ -194,6 +195,8 @@ function VM() {
     self.SendSMSModalVM = new SendSMSModalVM(self);
     self.selectedJob = ko.observable(null);
 
+    self.trackableAssetsModalVM = new TrackableAssetsModalVM(self);
+
     self.jobStatusConfirmVM = new JobStatusConfirmModalVM(self);
 
     self.attachJobStatusConfirmModal = function (job, newStatus) {
@@ -915,6 +918,32 @@ function VM() {
         });
     };
 
+    self.openTrackableAssetsModal = function (data, event) {
+        // If called from a dropdown menu, close the dropdown
+        if (event && event.target) {
+            // Find the closest .dropdown and its .dropdown-toggle button
+            let dropdown = event.target.closest('.dropdown');
+            if (dropdown) {
+                let toggleBtn = dropdown.querySelector('[data-bs-toggle="dropdown"]');
+                if (toggleBtn) {
+                    // Use Bootstrap 5 API to close the dropdown
+                    let dropdownInstance = bootstrap.Dropdown.getOrCreateInstance(toggleBtn);
+                    dropdownInstance.hide();
+                }
+            }
+        }
+        const modalEl = document.getElementById('trackableAssetsModal');
+        if (modalEl) {
+            self.trackableAssetsModalVM.isOpen(true)
+            bootstrap.Modal.getOrCreateInstance(modalEl).show();
+        }
+        if (modalEl) {
+            modalEl.addEventListener('hidden.bs.modal', () => {
+                self.trackableAssetsModalVM.isOpen(false);
+            });
+        }
+    }
+
 
     // Job registry/upsert
     // might be called from tasking OR job fetch so values might be missing
@@ -1520,7 +1549,11 @@ function VM() {
     self.fetchAllTeamData = async function () {
         const hqsFilter = this.config.teamFilters().map(f => ({ Id: f.id }));
 
-        const statusFilterToView = myViewModel.config.teamStatusFilter().map(status => Enum.TeamStatusType[status]?.Id).filter(id => id !== undefined);
+        const statusFilterToView = myViewModel.config.teamStatusFilter().map(desc => {
+            // Find the Enum.TeamStatusType entry whose Description matches desc
+            const entry = Object.values(Enum.TeamStatusType).find(e => e.Description === desc);
+            return entry ? entry.Id : undefined;
+        }).filter(id => id !== undefined);
         var end = new Date();
         var start = new Date();
         start.setDate(end.getDate() - myViewModel.config.fetchPeriod());
@@ -2184,14 +2217,14 @@ document.addEventListener('DOMContentLoaded', function () {
         });
     });
 
+})
 
+// wait for full CSS + DOM
+window.addEventListener('load', function () {
+    document.body.style.opacity = '1';
+});
 
-    // wait for full CSS + DOM
-    window.addEventListener('load', function () {
-        document.body.style.opacity = '1';
-    });
 
-})
 
 function getSearchParameters() {
     var prmstr = window.location.search.substr(1);
@@ -2206,4 +2239,4 @@ function transformToAssocArray(prmstr) {
         params[tmparr[0]] = decodeURIComponent(tmparr[1]);
     }
     return params;
-}
+}