From 56d6527bf5570563357965339440501f901a9030 Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Wed, 24 Apr 2024 09:09:35 +0100 Subject: [PATCH] add run commands to mobile ui (#6044) Signed-off-by: si458 --- views/default-mobile.handlebars | 218 +++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 1 deletion(-) diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index 0dc51bfa..f6d9b2b2 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -1,4 +1,4 @@ - + @@ -674,6 +674,23 @@ .night .tagSpan { color: black; } + + #d3serveraction, #d2serveraction { + width: 100%; + background-color: #d3d9d6; + text-align: left; + padding: 3px; + } + + #d3serverfiles, #d2serverfiles { + width: 100%; + height: 150px; + background-color: white; + padding: 2px; + border: 1px solid gray; + overflow-y: scroll; + } + @@ -927,6 +944,7 @@       +
@@ -2570,6 +2588,111 @@ go(20); } + // + // FILE SELECTOR, DIALOG 3 + // + + function d3init() { + d3fileoptions = { dialog: 1, filter: 'd3filter', files: 'd3serverfiles', folderup: 'p3FolderUp', currentFolder: 'p3CurrentFolder', func: d3setActions }; + Q('d3localFile').value = ''; + Q('d3localFile').accept = Q('d3filter').value; + d3modechange(); + } + + function d3modechange() { + var mode = Q('d3uploadMode').value; + QV('d3localmode', mode == 1); + QV('d3servermode', mode == 2); + if (mode == 1) { d3setActions(); } else { d3updatefiles(); } + } + + var d3filetreelinkpath; + var d3filetreelocation = []; + var d3fileoptions = null; + function d3updatefiles() { + if (d3fileoptions == null) return; + if ((d3fileoptions.filter == 'd3filter') && (Q('d3uploadMode').value == 1)) return; + var html1 = '', html2 = '', filetreex = filetree, folderdepth = 1, publicPath = null, lastFolderName = ''; + + // Navigate to path location, build the paths at the same time + var d3filetreelocation2 = [], oldlinkpath = d3filetreelinkpath, checkedBoxes = [], checkboxes = document.getElementsByName('fc'); + for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { checkedBoxes.push(checkboxes[i].value) }; } // Save all existing checked boxes + + d3filetreelinkpath = ''; + for (var i in d3filetreelocation) { + if ((filetreex.f != null) && (filetreex.f[d3filetreelocation[i]] != null)) { + d3filetreelocation2.push(d3filetreelocation[i]); + if ((folderdepth == 1)) { + var sp = d3filetreelocation[i].split('/'); + publicPath = window.location + sp[0] + 'files/' + sp[2]; + if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); } + } else { + if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } } + } + filetreex = filetreex.f[d3filetreelocation[i]]; + lastFolderName = filetreex.n; + folderdepth++; + } else { + break; + } + } + d3filetreelocation = d3filetreelocation2; // In case we could not go down the full path, we set the new path location here. + + // Sort the files + var filetreexx = p5sort_files(filetreex.f); + + // File filter + var fileFilter = ''; + if (d3fileoptions.filter) { fileFilter = Q(d3fileoptions.filter).value }; + + // Display all files and folders at this location + for (var i in filetreexx) { + // Figure out the name and shortname + var f = filetreexx[i], name = f.n, shortname; + + // Filter out files + if ((f.t == 3) && (fileFilter != '') && (f.nx.toLowerCase().endsWith(fileFilter) == false)) { continue; } + if (name.length > 70) { shortname = '' + EscapeHtml(name.substring(0, 70)) + ("..." + ''); } else { shortname = EscapeHtml(name); } + + // Figure out the size + var fsize = ''; + if (f.s != null) { fsize = getFileSizeStr(f.s); } + + var h = ''; + if (f.t != 3) { + var title = ''; + h = '
 ' + shortname + '
'; + } else { + var link = shortname; + //if (f.s > 0) { link = "" + shortname + ""; } + h = '
 ' + EscapeHtml(fsize) + '
' + link + '
'; + } + + if (f.t < 3) { html1 += h; } else { html2 += h; } + } + + if (d3fileoptions.currentFolder) { QH(d3fileoptions.currentFolder, lastFolderName); } + QH(d3fileoptions.files, html1 + html2); + QE(d3fileoptions.folderup, d3filetreelocation.length > 0); + if (d3fileoptions.func) { d3fileoptions.func(); } + } + + function d3folderset(x) { d3filetreelocation.push(decodeURIComponent(x)); d3updatefiles(); return false; } + function d3folderup(x) { if (x == null) { d3filetreelocation.pop(); } else { while (d3filetreelocation.length > x) { d3filetreelocation.pop(); } } d3updatefiles(); } + function d3getFileSel() { var cc = []; var checkboxes = document.getElementsByName('fcx'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { cc.push(checkboxes[i].value) } } return cc; } + function d3setActions() { + if (d3fileoptions.dialog == 1) { + var mode = Q('d3uploadMode').value; + if (mode == 1) { + QE('idx_dlgOkButton', Q('d3localFile').value.length > 0); + } else { + QE('idx_dlgOkButton', d3getFileSel().length == 1); + } + } else if (d3fileoptions.dialog == 2) { + QE('idx_dlgOkButton', d3getFileSel().length == 1); + } + } + // // MY FILES // @@ -3957,6 +4080,99 @@ meshserver.send({ action: 'msg', type: 'openUrl', nodeid: currentNode._id, url: Q('d2devurl').value }); } + function runDeviceCmd(nodeid) { if (xxdialogMode) return; d2runCommandDialog({ nodeids: [ nodeid ? decodeURIComponent(nodeid) : currentNode._id ] }); } + + function d2runCommandDialog(options) { + var wintype = false, linuxtype = false, agenttype = false; + for (var i in options.nodeids) { + var n = getNodeFromId(options.nodeids[i]); + if (n.agent) { if ((GetNodeRights(n) & 24) == 24) { agenttype = true; } + if ((n.agent.id > 0) && (n.agent.id < 5)) { wintype = true; } else { linuxtype = true; } } + } + if ((wintype == true) || (linuxtype == true) || (agenttype == true)) { + // Fetch run options + var runopt = { type:1, runAs:0, source:1, cmd:'' }; + try { runopt = JSON.parse(getstore('runopt', runopt)); } catch (ex) {} + + if (options.selectedFile) { + var filename = options.selectedFile.name.toLowerCase(); + console.log('filename', filename); + if (filename.endsWith('.bat')) { runopt.type = 1; } + if (filename.endsWith('.ps1')) { runopt.type = 2; } + if (filename.endsWith('.sh')) { runopt.type = 3; } + if (filename.endsWith('.agentconsole')) { runopt.type = 4; } + } + + var x = ''; + if (options.title) { x += options.title + '
'; } + x += ''; + x += ''; + if (options.selectedFile == null) { + x += ''; + x += ''; + if (userinfo.siteadmin & 8) { x += ''; } + } + setDialogMode(2, "Run Commands", 3, d2groupActionFunctionRunCommands, x, options); + if (options.selectedFile == null) { + Q('d2runcmd').focus(); + if (userinfo.siteadmin & 8) { d3fileoptions = { dialog: 2, files: 'd2serverfiles', folderup: 'p2FolderUp', currentFolder: 'p2CurrentFolder', func: null }; d3updatefiles(); } // Update the server files + } + d2runCommandValidate(); + } + } + + function d2runCommandValidate() { + QV('d2cmduser', Q('d2cmdtype').value < 4); + if (xxdialogTag.selectedFile == null) { + QV('d2runcmd', Q('d2cmdsource').value == 0); + QV('d2runfile', Q('d2cmdsource').value == 1); + QV('d2runsfile', Q('d2cmdsource').value == 2); + var ok = false; + if (Q('d2cmdsource').value == 0) { if (Q('d2runcmd').value.length > 0) { ok = true; } } // From text box + if (Q('d2cmdsource').value == 1) { if (Q('d2runfileex').files.length == 1) { ok = true; } } // From file + if (Q('d2cmdsource').value == 2) { ok = false; } // From server file + QE('idx_dlgOkButton', ok); + } else { + QE('idx_dlgOkButton', true); + } + } + + function d2groupActionFunctionRunCommands(b, options) { + var type = 3; + try { type = parseInt(Q('d2cmdtype').value); } catch (ex) { } + if (options.selectedFile == null) { putstore('runopt', JSON.stringify({ type: type, runAs: parseInt(Q('d2cmduser').value), source: parseInt(Q('d2cmdsource').value), cmd: encodeURIComponent(Q('d2runcmd').value) })); } // Save run options + var cmd = { action: 'runcommands', nodeids: options.nodeids, type: type, runAsUser: parseInt(Q('d2cmduser').value) }; + if (options.selectedFile) { + // Drag & drop file + var reader = new FileReader(); + reader.onload = function (e) { cmd.cmds = e.target.result; meshserver.send(cmd); if (options.func) { options.func(); } } + reader.readAsText(options.selectedFile); + } else if (Q('d2cmdsource').value == 0) { + // From text box + cmd.cmds = Q('d2runcmd').value; + meshserver.send(cmd); + if (options.func) { options.func(); } + } else if (Q('d2cmdsource').value == 1) { + // From file + var reader = new FileReader(); + reader.onload = function (e) { cmd.cmds = e.target.result; meshserver.send(cmd); if (options.func) { options.func(); } } + reader.readAsText(Q('d2runfileex').files[0]); + } else if (Q('d2cmdsource').value == 2) { + // From server file + var files = d3getFileSel(); + if (files.length != 1) return; + cmd.cmdpath = d3filetreelocation.join('/') + '/' + files[0]; + meshserver.send(cmd); + if (options.func) { options.func(); } + } + } + // Look to see if we need to update the device timeline function updateDeviceTimeline() { if ((meshserver.State != 2) || (powerTimelineNode == null) || (powerTimelineUpdate == null) || (currentNode == null) || (currentNode.mtype == 3)) return;