MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-09 12:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added URL switching support to mobile app.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-02-17 11:32:40 -08:00
parent 00d8e8efcd
commit 235bdd911d
1 changed files with 90 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
views/default-mobile.handlebars
View File

@ -1135,10 +1135,21 @@
for (var i in webState) { localStorage.setItem(i, webState[i]); } for (var i in webState) { localStorage.setItem(i, webState[i]); }
if (webState && !webState.loctag) { delete localStorage.removeItem('loctag'); } if (webState && !webState.loctag) { delete localStorage.removeItem('loctag'); }
// Fetch URL arguments & do sanitation
var urlargs = parseUriArgs(); var urlargs = parseUriArgs();
if (urlargs.key != null) { urlargs.key = "" + urlargs.key; }
if (urlargs.key && (isAlphaNumeric(urlargs.key) == false)) { delete urlargs.key; } if (urlargs.key && (isAlphaNumeric(urlargs.key) == false)) { delete urlargs.key; }
if (urlargs.locale && (isAlphaNumeric(urlargs.locale) == false)) { delete urlargs.locale; } if (urlargs.locale && (isAlphaNumeric(urlargs.locale) == false)) { delete urlargs.locale; }
var args = urlargs; delete urlargs.viewmode;
delete urlargs.gotonode;
delete urlargs.gotomesh;
delete urlargs.panel;
// Check if we are in debug mode
var args = parseUriArgs();
if (args.key && (isAlphaNumeric(args.key) == false)) { delete args.key; }
if (args.locale && (isAlphaNumeric(args.locale) == false)) { delete args.locale; }
var debugLevel = parseInt('{{{debuglevel}}}'); var debugLevel = parseInt('{{{debuglevel}}}');
var features = parseInt('{{{features}}}'); var features = parseInt('{{{features}}}');
var features2 = parseInt('{{{features2}}}'); var features2 = parseInt('{{{features2}}}');
@ -1259,7 +1270,6 @@
meshserver.send({ action: 'meshes' }); meshserver.send({ action: 'meshes' });
meshserver.send({ action: 'nodes' }); meshserver.send({ action: 'nodes' });
meshserver.send({ action: 'files' }); meshserver.send({ action: 'files' });
if (xxcurrentView < 2) { go(2); }
authCookieRenewTimer = setInterval(function () { meshserver.send({ action: 'authcookie' }); }, 1800000); // Request a cookie refresh every 30 minutes. authCookieRenewTimer = setInterval(function () { meshserver.send({ action: 'authcookie' }); }, 1800000); // Request a cookie refresh every 30 minutes.
} }
QV('topMenuIcon', state == 2); QV('topMenuIcon', state == 2);
@ -1353,7 +1363,7 @@
for (var m in message.meshes) { meshes[message.meshes[m]._id] = message.meshes[m]; } for (var m in message.meshes) { meshes[message.meshes[m]._id] = message.meshes[m]; }
if (currentMesh != null) { currentMesh = meshes[currentMesh._id]; } if (currentMesh != null) { currentMesh = meshes[currentMesh._id]; }
updateMeshes(); updateMeshes();
updateDevices(); mainUpdate(4);
break; break;
} }
case 'usergroups': { case 'usergroups': {
@ -1400,7 +1410,7 @@
//onSortSelectChange(); //onSortSelectChange();
//onSearchInputChanged(); //onSearchInputChanged();
updateDevices(); mainUpdate(4);
//refreshMap(false, true); //refreshMap(false, true);
if (xxcurrentView == 0) { if ('{{viewmode}}' != '') { go(parseInt('{{viewmode}}')); } else { setDialogMode(0); go(2); } } if (xxcurrentView == 0) { if ('{{viewmode}}' != '') { go(parseInt('{{viewmode}}')); } else { setDialogMode(0); go(2); } }
if ('{{currentNode}}' != '') { gotoDevice('{{currentNode}}', parseInt('{{viewmode}}')); } if ('{{currentNode}}' != '') { gotoDevice('{{currentNode}}', parseInt('{{viewmode}}')); }
@ -1564,10 +1574,9 @@
// Update the web page // Update the web page
if ((webstate.loctag != null) && (webstate.loctag != oldLoctag)) { if ((webstate.loctag != null) && (webstate.loctag != oldLoctag)) {
if (webstate.loctag != null) { args.locale = webstate.loctag; } else { delete args.locale; } if (webstate.loctag != null) { args.locale = webstate.loctag; } else { delete args.locale; }
updateDevices(); mainUpdate(4 + 128);
updateMeshes();
} else if (webstate.stars != null) { } else if (webstate.stars != null) {
updateDevices(); mainUpdate(4);
if (Q('SearchInput').value == '*') { onSearchInputChanged(); } if (Q('SearchInput').value == '*') { onSearchInputChanged(); }
} }
if (currentNode) { refreshDevice(currentNode._id); } if (currentNode) { refreshDevice(currentNode._id); }
@ -1633,8 +1642,7 @@
// A new mesh was created // A new mesh was created
if ((meshes[message.event.meshid] == null) && ((userinfo.manageAllDeviceGroups) || (message.event.links[userinfo._id] != null))) { // Check if this is a mesh create for a mesh we own. If site administrator, we get all messages so need to ignore some. if ((meshes[message.event.meshid] == null) && ((userinfo.manageAllDeviceGroups) || (message.event.links[userinfo._id] != null))) { // Check if this is a mesh create for a mesh we own. If site administrator, we get all messages so need to ignore some.
meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links }; meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
updateMeshes(); mainUpdate(4 + 128);
updateDevices();
meshserver.send({ action: 'files' }); meshserver.send({ action: 'files' });
} }
break; break;
@ -1676,8 +1684,7 @@
if (xxcurrentView >= 10 && xxcurrentView < 20 && currentNode && !IsNodeViewable(currentNode)) { setDialogMode(0); go(2); currentNode = null; } if (xxcurrentView >= 10 && xxcurrentView < 20 && currentNode && !IsNodeViewable(currentNode)) { setDialogMode(0); go(2); currentNode = null; }
} }
} }
updateMeshes(); mainUpdate(4 + 128);
updateDevices();
meshserver.send({ action: 'files' }); meshserver.send({ action: 'files' });
// If we are looking at a mesh that is now deleted, move back to "My Account" // If we are looking at a mesh that is now deleted, move back to "My Account"
@ -1696,7 +1703,7 @@
var newnodes = []; var newnodes = [];
for (var i in nodes) { if (nodes[i].meshid != message.event.meshid) { newnodes.push(nodes[i]); } } for (var i in nodes) { if (nodes[i].meshid != message.event.meshid) { newnodes.push(nodes[i]); } }
nodes = newnodes; nodes = newnodes;
updateDevices(); mainUpdate(4);
// If we are looking at a mesh that is now deleted, move back to "My Account" // If we are looking at a mesh that is now deleted, move back to "My Account"
if (xxcurrentView >= 20 && xxcurrentView < 30 && currentMesh._id == message.event.meshid) { setDialogMode(0); go(2); } if (xxcurrentView >= 20 && xxcurrentView < 30 && currentMesh._id == message.event.meshid) { setDialogMode(0); go(2); }
@ -1718,7 +1725,7 @@
nodes.push(node); nodes.push(node);
//onSortSelectChange(); //onSortSelectChange();
//onSearchInputChanged(); //onSearchInputChanged();
updateDevices(); mainUpdate(4);
//updateMapMarkers(); //updateMapMarkers();
break; break;
} }
@ -1733,7 +1740,7 @@
// TODO: Correctly disconnect from this node (Desktop/Terminal/Files...) // TODO: Correctly disconnect from this node (Desktop/Terminal/Files...)
} }
nodes.splice(index, 1); nodes.splice(index, 1);
updateDevices(); mainUpdate(4);
//updateMapMarkers(); //updateMapMarkers();
} }
break; break;
@ -1788,7 +1795,7 @@
//drawNotifications(); //drawNotifications();
refreshDevice(node._id); refreshDevice(node._id);
//updateMapMarkers(); //updateMapMarkers();
updateDevices(); mainUpdate(4);
if (currentNode == node) { updateDeviceDetails(); } if (currentNode == node) { updateDeviceDetails(); }
//if ((currentNode == node) && (xxdialogMode != null) && (xxdialogTag == '@xxmap')) { p10showNodeLocationDialog(); } //if ((currentNode == node) && (xxdialogMode != null) && (xxdialogTag == '@xxmap')) { p10showNodeLocationDialog(); }
@ -1811,7 +1818,7 @@
node.meshid = message.event.newMeshId; node.meshid = message.event.newMeshId;
node.meshnamel = meshes[message.event.newMeshId]?meshes[message.event.newMeshId].name.toLowerCase():'*'; node.meshnamel = meshes[message.event.newMeshId]?meshes[message.event.newMeshId].name.toLowerCase():'*';
} }
updateDevices(); mainUpdate(4);
refreshDevice(message.event.nodeid); refreshDevice(message.event.nodeid);
} else { } else {
// This is a new device, add it. // This is a new device, add it.
@ -1828,7 +1835,7 @@
// Web page update // Web page update
//mainUpdate(1 | 2 | 4 | 16); //mainUpdate(1 | 2 | 4 | 16);
updateDevices(); mainUpdate(4);
} }
break; break;
} }
@ -1846,7 +1853,7 @@
// Clear sesssion information if needed // Clear sesssion information if needed
if ((node.conn & 1) == 0) { delete node.sessions; } if ((node.conn & 1) == 0) { delete node.sessions; }
updateDevices(); mainUpdate(4);
refreshDevice(node._id); refreshDevice(node._id);
//updateMapMarkers(); //updateMapMarkers();
} }
@ -1885,10 +1892,8 @@
if (Object.keys(node.sessions).length == 0) { delete node.sessions; } if (Object.keys(node.sessions).length == 0) { delete node.sessions; }
} }
updateDevices();
refreshDevice(message.event.nodeid); refreshDevice(message.event.nodeid);
mainUpdate(4);
//mainUpdate(4);
//if ((currentNode != null) && (currentNode._id == message.event.nodeid)) { gotoDevice(currentNode._id, xxcurrentView, true); } //if ((currentNode != null) && (currentNode._id == message.event.nodeid)) { gotoDevice(currentNode._id, xxcurrentView, true); }
// If we are looking at the sessions dialog box for this device now, update it // If we are looking at the sessions dialog box for this device now, update it
@ -1914,6 +1919,50 @@
} }
} }
// To boost the speed of the web page when even floods occur, this method perform a delayed update on the web page.
var updateNaggleTimer = null;
var updateNaggleFlags = 0;
function mainUpdate(flags) {
updateNaggleFlags |= flags;
if (updateNaggleTimer == null) {
updateNaggleTimer = setTimeout(function () {
if (updateNaggleFlags & 4) { updateDevices(); updateDeviceDetails(); }
if (updateNaggleFlags & 128) { updateMeshes(); }
updateNaggleTimer = null;
updateNaggleFlags = 0;
gotoStartViewPage();
}, 150);
}
}
// Go to the correct starting view page
function gotoStartViewPage() {
var xviewmode = parseInt('{{viewmode}}');
if (xxcurrentView > 1) return;
if ('{{currentNode}}'.toLowerCase() != '') { // The .toLowerCase here is the minifier will not optimize this out.
if (getNodeFromId('{{currentNode}}') == null) return; // This node is not loaded yet
gotoDevice('{{currentNode}}', xviewmode);
} else if (args.gotonode != null) {
if (args.gotonode.length == 96) { args.gotonode = btoa(hex2rstr(args.gotonode)).split('+').join('@').split('/').join('$'); } // This is a HEX encoded NodeID, convert it to Base64
if (getNodeFromId('node/' + domain + '/' + args.gotonode) == null) return; // This node is not loaded yet
if (args.panel) { currentDevicePanel = parseInt(args.panel); }
gotoDevice('node/' + domain + '/' + args.gotonode, xviewmode);
} else if (args.gotomesh != null) {
if (meshes['mesh/' + domain + '/' + args.gotomesh] == null) return; // This device group is not loaded yet
gotoMesh('mesh/' + domain + '/' + args.gotomesh);
go(xviewmode);
} else if (!isNaN(xviewmode)) {
go(xviewmode);
} else {
setDialogMode(0);
go(1);
}
delete args.gotonode;
delete args.gotomesh;
delete args.panel;
if (xxcurrentView < 2) { go(2); }
}
// //
// Menu System // Menu System
// //
@ -2448,7 +2497,7 @@
function onRealNameCheckBox() { function onRealNameCheckBox() {
showRealNames = Q('RealNameCheckBox').checked; showRealNames = Q('RealNameCheckBox').checked;
putstore('showRealNames', showRealNames ? 1 : 0); putstore('showRealNames', showRealNames ? 1 : 0);
updateDevices(); mainUpdate(4);
} }
function onOnlineCheckBox(e) { function onOnlineCheckBox(e) {
@ -2523,7 +2572,7 @@
// Check power state // Check power state
var onlineOnly = Q('OnlineCheckBox').checked; var onlineOnly = Q('OnlineCheckBox').checked;
if (onlineOnly) { for (var d in nodes) { if ((nodes[d].conn == null) || (nodes[d].conn == 0)) { nodes[d].v = false; } } } if (onlineOnly) { for (var d in nodes) { if ((nodes[d].conn == null) || (nodes[d].conn == 0)) { nodes[d].v = false; } } }
updateDevices(); mainUpdate(4);
} }
var gotKeyPressEvent = false; var gotKeyPressEvent = false;
@ -2585,10 +2634,6 @@
} }
} }
// Since the update device call can be quite frequent, we can moderate it and only call it at most 5 times a second.
var updateDevicesTimer = null;
function updateDevices() { if (updateDevicesTimer != null) return; updateDevicesTimer = setTimeout(updateDevicesEx, 200); }
var sort = 0; var sort = 0;
var deviceHeaderId = 0; var deviceHeaderId = 0;
var deviceHeaderCount; var deviceHeaderCount;
@ -2597,8 +2642,7 @@
var deviceHeaderTotal = 0; var deviceHeaderTotal = 0;
var deviceHeaders = {}; var deviceHeaders = {};
var deviceHeadersTitles = {}; var deviceHeadersTitles = {};
function updateDevicesEx() { function updateDevices() {
if (updateDevicesTimer != null) { clearTimeout(updateDevicesTimer); updateDevicesTimer = null; }
var r = '', c = 0, current = null, count = 0, displayedMeshes = {}, groups = {}, groupCount = {}; var r = '', c = 0, current = null, count = 0, displayedMeshes = {}, groups = {}, groupCount = {};
// 3 wide, list view or desktop view // 3 wide, list view or desktop view
@ -2895,7 +2939,7 @@
function onSortSelectChange(skipsave) { function onSortSelectChange(skipsave) {
sort = document.getElementById('sortselect').selectedIndex; sort = document.getElementById('sortselect').selectedIndex;
if (!skipsave) { putstore('sort', sort); } if (!skipsave) { putstore('sort', sort); }
updateDevicesEx(); mainUpdate(4);
} }
function deviceHeaderSet() { function deviceHeaderSet() {
@ -3216,6 +3260,7 @@
if ((currentDevicePanel != 3) && (currentNode != null)) { menus.push({ n: "Details", f: 'setupDeviceMenu(3)' }); } if ((currentDevicePanel != 3) && (currentNode != null)) { menus.push({ n: "Details", f: 'setupDeviceMenu(3)' }); }
if ((currentDevicePanel != 4) && (currentNode != null) && (meshrights & 0x00000010)) { menus.push({ n: "Console", f: 'setupDeviceMenu(4)' }); } if ((currentDevicePanel != 4) && (currentNode != null) && (meshrights & 0x00000010)) { menus.push({ n: "Console", f: 'setupDeviceMenu(4)' }); }
updateFooterMenu(menus); updateFooterMenu(menus);
updateCurrentUrl();
} }
function deviceActionFunction() { function deviceActionFunction() {
@ -5427,6 +5472,21 @@
// Edit this line when adding a new screen // Edit this line when adding a new screen
for (var i = 0; i < 32; i++) { QV('p' + i, i == x); } for (var i = 0; i < 32; i++) { QV('p' + i, i == x); }
xxcurrentView = x; xxcurrentView = x;
updateCurrentUrl();
}
// Change the URL
function updateCurrentUrl() {
if (((features & 0x10000000) == 0) && (xxcurrentView > 0)) {
var urlviewmode = '';
if ((xxcurrentView >= 10) && (xxcurrentView <= 19)) { // Device Link
if (currentNode != null) { urlviewmode = '?viewmode=' + xxcurrentView + '&gotonode=' + currentNode._id.split('/')[2] + ((currentDevicePanel > 0)?('&panel=' + currentDevicePanel):''); }
} else if ((xxcurrentView >= 20) && (xxcurrentView <= 29)) { // Device Group Link
if (currentMesh != null) { urlviewmode = '?viewmode=' + xxcurrentView + '&gotomesh=' + currentMesh._id.split('/')[2]; }
} else if (xxcurrentView > 1) { urlviewmode = '?viewmode=' + xxcurrentView; }
for (var i in urlargs) { urlviewmode += (((urlviewmode == '') ? '?' : '&') + i + '=' + urlargs[i]); }
try { window.history.replaceState({}, document.title, window.location.pathname + urlviewmode); } catch (ex) { }
}
} }
// //