From 01f8dc5f6b7cfecae6a4171fca4bd1228df19838 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Thu, 22 Aug 2024 20:02:18 +1000 Subject: [PATCH] Small fixes --- docs/BACKUPS.md | 2 +- front/css/app.css | 4 ++-- front/js/common.js | 7 +++++-- front/settings.php | 3 ++- server/initialise.py | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/BACKUPS.md b/docs/BACKUPS.md index 45301117..8f21aabc 100755 --- a/docs/BACKUPS.md +++ b/docs/BACKUPS.md @@ -11,7 +11,7 @@ There are 3 artifacts that can be used to backup the application: | `/config/app.conf` | Configuration file | Doesn't contain settings from the Maintenance section | | `/config/devices.csv` | CSV file containing device information | Doesn't contain historical data | -## Data and cackup storage +## Data and backup storage To decide on a backup strategy, check where the data is stored: diff --git a/front/css/app.css b/front/css/app.css index 6740bcf2..c2d9e74b 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1390,7 +1390,7 @@ input[readonly] { opacity: 0.8; background-color: #fff; - z-index: 99; + z-index: 1000; } .pa_spinner { @@ -1403,7 +1403,7 @@ input[readonly] { padding: 15px; width: 200px; background-color: #fff; - z-index: 100; + z-index: 1001; } #loadingSpinner diff --git a/front/js/common.js b/front/js/common.js index b4dd95fd..2e0e786a 100755 --- a/front/js/common.js +++ b/front/js/common.js @@ -399,6 +399,7 @@ function handle_locked_DB(data) showSpinner() setTimeout(function() { + console.warn("Database locked - reload") location.reload(); }, 5000); } @@ -1153,8 +1154,9 @@ function clearCache() { sessionStorage.clear(); localStorage.clear(); setTimeout(() => { - window.location.reload(); -}, 500); + console.warn("clearChache called"); + window.location.reload(); + }, 500); } // ----------------------------------------------------------------------------- @@ -1291,6 +1293,7 @@ setTimeout(() => { // page refresh if configured const refreshTime = getSetting("UI_REFRESH"); if (refreshTime && refreshTime !== "0" && refreshTime !== "") { + console.log("Refreshing page becasue UI_REFRESH setting enabled."); newTimerRefreshData(clearCache, parseInt(refreshTime)*1000); } diff --git a/front/settings.php b/front/settings.php index 12fbe9b2..03f3b3a5 100755 --- a/front/settings.php +++ b/front/settings.php @@ -460,7 +460,7 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX // INPUT - console.log(codeName); + // console.log(codeName); // Parse the setType JSON string into an object let inputHtml = ''; @@ -795,6 +795,7 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX } else { + console.log("isAppInitialized() returned false, reloading in 3s"); // reload the page if not initialized to give time the background tasks to finish setTimeout(() => { diff --git a/server/initialise.py b/server/initialise.py index b940db7a..50c3df77 100755 --- a/server/initialise.py +++ b/server/initialise.py @@ -140,7 +140,7 @@ def importConfigs (db, all_plugins): conf.DAYS_TO_KEEP_EVENTS = ccd('DAYS_TO_KEEP_EVENTS', 90 , c_d, 'Delete events days', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', '[]', 'General') conf.HRS_TO_KEEP_NEWDEV = ccd('HRS_TO_KEEP_NEWDEV', 0 , c_d, 'Keep new devices for', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', "[]", 'General') conf.API_CUSTOM_SQL = ccd('API_CUSTOM_SQL', 'SELECT * FROM Devices WHERE dev_PresentLastScan = 0' , c_d, 'Custom endpoint', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]}', '[]', 'General') - conf.NETWORK_DEVICE_TYPES = ccd('NETWORK_DEVICE_TYPES', ['AP', 'Gateway', 'Firewall', 'Hypervisor', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet'] , c_d, 'Network device types', '{"dataType":"array","elements":[{"elementType":"input","elementOptions":[{"placeholder":"Entervalue"},{"suffix":"_in"},{"cssClasses":"col-sm-10"},{"prefillValue":"null"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":["_in"]},{"separator":""},{"cssClasses":"col-xs-12"},{"onClick":"addList(this,false)"},{"getStringKey":"Gen_Add"}],"transformers":[]},{"elementType":"select", "elementHasInputValue":1,"elementOptions":[{"multiple":"true"},{"readonly":"true"},{"editable":"true"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-6"},{"onClick":"removeAllOptions(this)"},{"getStringKey":"Gen_Remove_All"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-6"},{"onClick":"removeFromList(this)"},{"getStringKey":"Gen_Remove_Last"}],"transformers":[]}]}', '[]', 'General') + conf.NETWORK_DEVICE_TYPES = ccd('NETWORK_DEVICE_TYPES', ['AP', 'Gateway', 'Firewall', 'Hypervisor', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet'] , c_d, 'Network device types', '{"dataType":"array","elements":[{"elementType":"input","elementOptions":[{"placeholder":"Enter value"},{"suffix":"_in"},{"cssClasses":"col-sm-10"},{"prefillValue":"null"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":["_in"]},{"separator":""},{"cssClasses":"col-xs-12"},{"onClick":"addList(this,false)"},{"getStringKey":"Gen_Add"}],"transformers":[]},{"elementType":"select", "elementHasInputValue":1,"elementOptions":[{"multiple":"true"},{"readonly":"true"},{"editable":"true"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-6"},{"onClick":"removeAllOptions(this)"},{"getStringKey":"Gen_Remove_All"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-6"},{"onClick":"removeFromList(this)"},{"getStringKey":"Gen_Remove_Last"}],"transformers":[]}]}', '[]', 'General') # UI conf.UI_LANG = ccd('UI_LANG', 'English' , c_d, 'Language Interface', '{"dataType":"string", "elements": [{"elementType" : "select", "elementOptions" : [] ,"transformers": []}]}', "['English', 'French', 'German', 'Norwegian', 'Russian', 'Spanish', 'Italian (it_it)', 'Portuguese (pt_br)', 'Polish (pl_pl)', 'Turkish (tr_tr)', 'Chinese (zh_cn)', 'Czech (cs_cz)' ]", 'UI')