luci-app-dawn: Bug fixes for JavaScript implementation

Some bug fixes and a small improvements that were discovered after the
initial implementation of the JavaScript version of luci-app-dawn:

* Correctly show multiple APs per client in the hearing map
* Display correct name of all APs in the hearing map
* Show if client is connected to the network in the hearing map. This
  replaces the column for Stations Connected, which is not a property
  of a client but of an AP, and is available still in the network overview.
* Display both hostname and MAC address for clients/APs
* Convert spaces to tabs in dawn-common.js for consistency

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit e8029b08287c666a43d5ef25c7ea83ce7d606903)

diff --git a/applications/luci-app-dawn/htdocs/luci-static/resources/dawn/dawn-common.js b/applications/luci-app-dawn/htdocs/luci-static/resources/dawn/dawn-common.js
index 5d002d9b7fb20ed61db359cc829eaacd346a019e..79f37a7d63a20110fb541994575e11eb602ae9bd 100644 (file)
--- a/applications/luci-app-dawn/htdocs/luci-static/resources/dawn/dawn-common.js
+++ b/applications/luci-app-dawn/htdocs/luci-static/resources/dawn/dawn-common.js
@@ -5,65 +5,70 @@
 let callDawnGetNetwork, callDawnGetHearingMap, callHostHints;
 
 callDawnGetNetwork = rpc.declare({
-  object: 'dawn',
-  method: 'get_network',
-  expect: {  }
+       object: 'dawn',
+       method: 'get_network',
+       expect: {  }
 });
 
 callDawnGetHearingMap = rpc.declare({
-  object: 'dawn',
-  method: 'get_hearing_map',
-  expect: {  }
+       object: 'dawn',
+       method: 'get_hearing_map',
+       expect: {  }
 });
 
 callHostHints = rpc.declare({
-  object: 'luci-rpc',
-  method: 'getHostHints',
-  expect: { }
+       object: 'luci-rpc',
+       method: 'getHostHints',
+       expect: { }
 });
 
 function getAvailableText(available) {
-  return ( available ? _('Available') : _('Not available') );
+       return ( available ? _('Available') : _('Not available') );
+}
+
+function getYesText(yes) {
+       return ( yes ? _('Yes') : _('No') );
 }
 
 function getChannelFromFrequency(freq) {
-  if (freq <= 2400) {
-    return 0;
-  }
-  else if (freq == 2484) {
-    return 14;
-  }
-  else if (freq < 2484) {
-    return (freq - 2407) / 5;
-  }
-  else if (freq >= 4910 && freq <= 4980) {
-    return (freq - 4000) / 5;
-  }
-  else if (freq <= 45000) {
-    return (freq - 5000) / 5;
-  }
-  else if (freq >= 58320 && freq <= 64800) {
-    return (freq - 56160) / 2160;
-  }
-  else {
-    return 0;
-  }
+       if (freq <= 2400) {
+               return 0;
+       }
+       else if (freq == 2484) {
+               return 14;
+       }
+       else if (freq < 2484) {
+               return (freq - 2407) / 5;
+       }
+       else if (freq >= 4910 && freq <= 4980) {
+               return (freq - 4000) / 5;
+       }
+       else if (freq <= 45000) {
+               return (freq - 5000) / 5;
+       }
+       else if (freq >= 58320 && freq <= 64800) {
+               return (freq - 56160) / 2160;
+       }
+       else {
+               return 0;
+       }
 }
 
 function getFormattedNumber(num, decimals, divider = 1) {
-  return (num/divider).toFixed(decimals);
+       return (num/divider).toFixed(decimals);
 }
 
 function getHostnameFromMAC(hosthints, mac) {
-  return ( hosthints[mac] && hosthints[mac].name ? hosthints[mac].name : mac);
+       return ( hosthints[mac] && hosthints[mac].name ? hosthints[mac].name + ' (' + mac + ')' : mac);
 }
 
 return L.Class.extend({
-  callDawnGetNetwork: callDawnGetNetwork, 
-  callDawnGetHearingMap: callDawnGetHearingMap,
-  callHostHints: callHostHints,
-  getAvailableText: getAvailableText,
-  getChannelFromFrequency: getChannelFromFrequency,
-  getFormattedNumber: getFormattedNumber,
-  getHostnameFromMAC: getHostnameFromMAC
+       callDawnGetNetwork: callDawnGetNetwork, 
+       callDawnGetHearingMap: callDawnGetHearingMap,
+       callHostHints: callHostHints,
+       getAvailableText: getAvailableText,
+       getYesText: getYesText,
+       getChannelFromFrequency: getChannelFromFrequency,
+       getFormattedNumber: getFormattedNumber,
+       getHostnameFromMAC: getHostnameFromMAC
 });

diff --git a/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/hearing_map.js b/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/hearing_map.js
index ea2aa67998563d701f26c84273243ad787129ef0..a5b59519ce7a5050ce71dc1064f7b824e7d66e97 100644 (file)
--- a/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/hearing_map.js
+++ b/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/hearing_map.js
@@ -11,6 +11,7 @@ return view.extend({
        load: function() {
                return Promise.all([
                        dawn.callDawnGetHearingMap(),
+                       dawn.callDawnGetNetwork(),
                        dawn.callHostHints()
                ]);
        },
@@ -18,7 +19,23 @@ return view.extend({
        render: function(data) {
 
                const dawnHearingMapData = data[0];
-               const hostHintsData = data[1];
+               const dawnNetworkData = data[1];
+               const hostHintsData = data[2];
+
+               let accessPointsHintsData = {};
+               let connectedClients = {};
+               for (let network in dawnNetworkData) {
+                       connectedClients[network] = [];
+                       let aps = Object.entries(dawnNetworkData[network]).map(function(ap) {
+                               accessPointsHintsData[ap[0]] = {name: ap[1].hostname};
+                               let clientData = Object.entries(ap[1]);
+                               for (let i = 0; i < clientData.length; i++) {
+                                       if (typeof clientData[i][1] === 'object') {
+                                               connectedClients[network].push(clientData[i][0]);
+                                       }
+                               }
+                       });
+               }
 
                const body = E([
                        E('h2', _('Hearing Map'))
@@ -41,7 +58,7 @@ return view.extend({
                                        E('th', { 'class': 'th' }, E('span', { 'data-tooltip': _('Received Channel Power Indication') }, [ _('RCPI') ])),
                                        E('th', { 'class': 'th' }, E('span', { 'data-tooltip': _('Received Signal to Noise Indicator') }, [ _('RSNI') ])),
                                        E('th', { 'class': 'th' }, _('Channel Utilization')),
-                                       E('th', { 'class': 'th' }, _('Stations Connected')),
+                                       E('th', { 'class': 'th' }, _('Connected to Network')),
                                        E('th', { 'class': 'th' }, _('Score'))
                                ])
                        ]);
@@ -53,7 +70,7 @@ return view.extend({
                                        if (ap[1].freq != 0) {
                                                return [
                                                        dawn.getHostnameFromMAC(hostHintsData, client[0]),
-                                                       dawn.getHostnameFromMAC(hostHintsData, ap[0]),
+                                                       dawn.getHostnameFromMAC(accessPointsHintsData, ap[0]),
                                                        dawn.getFormattedNumber(ap[1].freq, 3, 1000) + ' GHz (' + _('Channel') + ': ' + dawn.getChannelFromFrequency(ap[1].freq) + ')',
                                                        dawn.getAvailableText(ap[1].ht_capabilities && ap[1].ht_support),
                                                        dawn.getAvailableText(ap[1].vht_capabilities && ap[1].vht_support),
@@ -61,13 +78,13 @@ return view.extend({
                                                        ap[1].rcpi,
                                                        ap[1].rsni,
                                                        dawn.getFormattedNumber(ap[1].channel_utilization, 2, 2.55) + '%',
-                                                       ap[1].num_sta,
+                                                       dawn.getYesText(connectedClients[network].includes(client[0])),
                                                        ap[1].score
                                                ]
                                        }
-                               }).flat()
+                               })
                                
-                       });
+                       }).flat();
 
                        cbi_update_table(hearing_map_table, clients, E('em', _('No clients connected.')));