From ab34f5b2154ec07c9c8b918d8e5f2d7b641d78c2 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 22 Jun 2021 14:39:29 +0200
Subject: [PATCH] node/service view: code cleanups

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 src/node/ServiceView.js | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/node/ServiceView.js b/src/node/ServiceView.js
index 93ffcb1..ad44a74 100644
--- a/src/node/ServiceView.js
+++ b/src/node/ServiceView.js
@@ -24,8 +24,8 @@ Ext.define('Proxmox.node.ServiceView', {
 	    interval: 1000,
 	    model: 'proxmox-services',
 	    proxy: {
-                type: 'proxmox',
-                url: "/api2/json/nodes/" + me.nodename + "/services",
+		type: 'proxmox',
+		url: `/api2/json/nodes/${me.nodename}/services`,
 	    },
 	});
 
@@ -41,27 +41,24 @@ Ext.define('Proxmox.node.ServiceView', {
 	});
 
 	let view_service_log = function() {
-	    let sm = me.getSelectionModel();
-	    let rec = sm.getSelection()[0];
-	    let win = Ext.create('Ext.window.Window', {
-		title: gettext('Syslog') + ': ' + rec.data.service,
+	    let { data: { service } } = me.getSelectionModel().getSelection()[0];
+	    Ext.create('Ext.window.Window', {
+		title: gettext('Syslog') + ': ' + service,
 		modal: true,
 		width: 800,
 		height: 400,
 		layout: 'fit',
 		items: {
 		    xtype: 'proxmoxLogView',
-		    url: "/api2/extjs/nodes/" + me.nodename + "/syslog?service=" +
-			rec.data.service,
+		    url: `/api2/extjs/nodes/${me.nodename}/syslog?service=${service}`,
 		    log_select_timespan: 1,
 		},
+		autoShow: true,
 	    });
-	    win.show();
 	};
 
 	let service_cmd = function(cmd) {
-	    let rec = me.getSelectionModel().getSelection()[0];
-	    let service = rec.data.service;
+	    let { data: { service } } = me.getSelectionModel().getSelection()[0];
 	    Proxmox.Utils.API2Request({
 		url: `/nodes/${me.nodename}/services/${service}/${cmd}`,
 		method: 'POST',
@@ -71,12 +68,10 @@ Ext.define('Proxmox.node.ServiceView', {
 		},
 		success: function(response, opts) {
 		    rstore.startUpdate();
-		    let upid = response.result.data;
-
-		    let win = Ext.create('Proxmox.window.TaskProgress', {
-			upid: upid,
+		    Ext.create('Proxmox.window.TaskProgress', {
+			upid: response.result.data,
+			autoShow: true,
 		    });
-		    win.show();
 		},
 	    });
 	};