luci2: move most RPC proxy function declarations into the views using them to reduce...

[project/luci2/ui.git] / luci2 / htdocs / luci2 / view / status.processes.js

diff --git a/luci2/htdocs/luci2/view/status.processes.js b/luci2/htdocs/luci2/view/status.processes.js
index a30a09278bdc7b2d78fa732c298348e2abb374a3..b58df8af629e517e67fd03ce8912414b065795a6 100644 (file)
--- a/luci2/htdocs/luci2/view/status.processes.js
+++ b/luci2/htdocs/luci2/view/status.processes.js
@@ -1,62 +1,80 @@
 L.ui.view.extend({
-    title: L.tr('Processes'),
-    description: L.tr('This list gives an overview over currently running system processes and their status.'),
-    execute: function() {
-        var allow_signals = this.options.acls.status;
-        return L.system.getProcessList().then(function(list) {
-            var procTable = new L.ui.table({
-                columns: [ {
-                    caption: L.tr('PID'),
-                    key:     'pid'
-                }, {
-                    caption: L.tr('Owner'),
-                    key:     'user'
-                }, {
-                    caption: L.tr('Command'),
-                    key:     'command'
-                }, {
-                    caption: L.tr('CPU usage (%)'),
-                    key:     'cpu_percent',
-                    format:  '%d%%'
-                }, {
-                    caption: L.tr('Memory usage (%)'),
-                    key:     'vsize_percent',
-                    format:  '%d%%'
-                }, {
-                    key:    'pid',
-                    format: function(v, n) {
-                        return $('<button />')
-                            .attr('disabled', !allow_signals)
-                            .addClass('cbi-button')
-                            .addClass('cbi-button-reload')
-                            .text(L.tr('Hang Up'))
-                            .click(function() { L.system.sendSignal(v, 1).then(status) });
-                    }
-                }, {
-                    key:    'pid',
-                    format: function(v, n) {
-                        return $('<button />')
-                            .attr('disabled', !allow_signals)
-                            .addClass('cbi-button')
-                            .addClass('cbi-button-remove')
-                            .text(L.tr('Terminate'))
-                            .click(function() { L.system.sendSignal(v, 15).then(status) });
-                    }
-                }, {
-                    key:    'pid',
-                    format: function(v, n) {
-                        return $('<button />')
-                            .attr('disabled', !allow_signals)
-                            .addClass('cbi-button')
-                            .addClass('cbi-button-reset')
-                            .text(L.tr('Kill'))
-                            .click(function() { L.system.sendSignal(v, 9).then(status); });
-                    }
-                } ]
-            });
+       title: L.tr('Processes'),
+       description: L.tr('This list gives an overview over currently running system processes and their status.'),
 
-            procTable.rows(list);
-            procTable.insertInto('#process_table');
-        });
-    }
+       getProcessList: L.rpc.declare({
+               object: 'luci2.system',
+               method: 'process_list',
+               expect: { processes: [ ] },
+               filter: function(data) {
+                       data.sort(function(a, b) { return a.pid - b.pid });
+                       return data;
+               }
+       }),
+
+       sendSignal: L.rpc.declare({
+               object: 'luci2.system',
+               method: 'process_signal',
+               params: [ 'pid', 'signal' ],
+               filter: function(data) {
+                       return (data == 0);
+               }
+       }),
+
+       execute: function() {
+               var self = this;
+               var allow_signals = this.options.acls.status;
+               return self.getProcessList().then(function(list) {
+                       var procTable = new L.ui.table({
+                               columns: [ {
+                                       caption: L.tr('PID'),
+                                       key:     'pid'
+                               }, {
+                                       caption: L.tr('Owner'),
+                                       key:     'user'
+                               }, {
+                                       caption: L.tr('Command'),
+                                       key:     'command'
+                               }, {
+                                       caption: L.tr('CPU usage (%)'),
+                                       key:     'cpu_percent',
+                                       format:  '%d%%'
+                               }, {
+                                       caption: L.tr('Memory usage (%)'),
+                                       key:     'vsize_percent',
+                                       format:  '%d%%'
+                               }, {
+                                       key:    'pid',
+                                       format: function(v, n) {
+                                               return $('<div />')
+                                                       .addClass('btn-group')
+                                                       .append($('<button />')
+                                                               .addClass('btn btn-primary btn-sm dropdown-toggle')
+                                                               .attr('data-toggle', 'dropdown')
+                                                               .text(L.tr('Signal…')))
+                                                       .append($('<ul />')
+                                                               .addClass('dropdown-menu pull-right')
+                                                               .append($('<li />')
+                                                                       .append($('<a />')
+                                                                               .attr('href', '#')
+                                                                               .html('%s (<code>%s</code>)'.format(L.trc('UNIX signal', 'Reload'), 'HUP'))
+                                                                               .click(function(ev) { self.sendSignal(v, 1).then(status); ev.preventDefault(); })))
+                                                               .append($('<li />')
+                                                                       .append($('<a />')
+                                                                               .attr('href', '#')
+                                                                               .html('%s (<code>%s</code>)'.format(L.trc('UNIX signal', 'Terminate'), 'TERM'))
+                                                                               .click(function(ev) { self.sendSignal(v, 15).then(status); ev.preventDefault(); })))
+                                                               .append($('<li />')
+                                                                       .append($('<a />')
+                                                                               .attr('href', '#')
+                                                                               .html('%s (<code>%s</code>)'.format(L.trc('UNIX signal', 'Kill immediately'), 'KILL'))
+                                                                               .click(function(ev) { self.sendSignal(v, 9).then(status); ev.preventDefault(); }))))
+                                       }
+                               } ]
+                       });
+
+                       procTable.rows(list);
+                       procTable.insertInto('#process_table');
+               });
+       }
 });