diff options
| author | Daniel Vijge <danielvijge@gmail.com> | 2023-11-06 22:37:32 +0100 |
|---|---|---|
| committer | Daniel Vijge <danielvijge@gmail.com> | 2023-11-07 20:12:15 +0100 |
| commit | 69eeebe23d60736c1d4436162444f7b9c53de3ed (patch) | |
| tree | 2eb254e86cf35e05af262b5601aaff8e8d811d83 /applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn | |
| parent | e8029b08287c666a43d5ef25c7ea83ce7d606903 (diff) | |
luci-app-dawn: error message when service not running
Display a nicer error message when the DAWN service is not running
Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
Diffstat (limited to 'applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn')
| -rw-r--r-- | applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/hearing_map.js | 12 | ||||
| -rw-r--r-- | applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/network_overview.js | 8 |
2 files changed, 17 insertions, 3 deletions
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 a5b59519ce..8b93fbfd6d 100644 --- 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 @@ -10,8 +10,12 @@ return view.extend({ load: function() { return Promise.all([ - dawn.callDawnGetHearingMap(), - dawn.callDawnGetNetwork(), + dawn.isDawnRPCAvailable().then(function(isAvailable) { + return ( isAvailable ? dawn.callDawnGetHearingMap() : null ) + }), + dawn.isDawnRPCAvailable().then(function(isAvailable) { + return ( isAvailable ? dawn.callDawnGetNetwork() : null ) + }), dawn.callHostHints() ]); }, @@ -37,6 +41,10 @@ return view.extend({ }); } + if (!dawnHearingMapData || !dawnNetworkData) { + return dawn.getDawnServiceNotRunningErrorMessage(); + } + const body = E([ E('h2', _('Hearing Map')) ]); diff --git a/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/network_overview.js b/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/network_overview.js index 71133991ab..a605858eca 100644 --- a/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/network_overview.js +++ b/applications/luci-app-dawn/htdocs/luci-static/resources/view/dawn/network_overview.js @@ -10,7 +10,9 @@ return view.extend({ load: function() { return Promise.all([ - dawn.callDawnGetNetwork(), + dawn.isDawnRPCAvailable().then(function(isAvailable) { + return ( isAvailable ? dawn.callDawnGetNetwork() : null ); + }), dawn.callHostHints() ]); }, @@ -20,6 +22,10 @@ return view.extend({ const dawnNetworkData = data[0]; const hostHintsData = data[1]; + if (!dawnNetworkData) { + return dawn.getDawnServiceNotRunningErrorMessage(); + } + const body = E([ E('h2', _('Network Overview')) ]); |