From 105e5756817a47e8b01c353b1871c8fd4d13f36a Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 3 Dec 2019 14:29:36 +0100
Subject: [PATCH] ui: ha: calculate service name in model to fix sorting

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 www/manager6/ha/Resources.js  | 11 +----------
 www/manager6/ha/StatusView.js | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/www/manager6/ha/Resources.js b/www/manager6/ha/Resources.js
index fe1dfa3c..42364c6d 100644
--- a/www/manager6/ha/Resources.js
+++ b/www/manager6/ha/Resources.js
@@ -145,16 +145,7 @@ Ext.define('PVE.ha.ResourcesView', {
 		    header: gettext('Name'),
 		    width: 100,
 		    sortable: true,
-		    dataIndex: 'sid',
-		    renderer: function(value, metaData, record) {
-			let res = value.match(/^(\S+):(\S+)$/);
-			if (res[1] !== 'vm' && res[1] !== 'ct') {
-			    return '-';
-			}
-			//var guestType = res[1];
-			let vmid = res[2];
-			return PVE.data.ResourceStore.guestName(vmid);
-		    }
+		    dataIndex: 'vname',
 		},
 		{
 		    header: gettext('Max. Restart'),
diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js
index ec5fc98e..2e8fc559 100644
--- a/www/manager6/ha/StatusView.js
+++ b/www/manager6/ha/StatusView.js
@@ -72,7 +72,21 @@ Ext.define('PVE.ha.StatusView', {
 	    'id', 'type', 'node', 'status', 'sid',
 	    'state', 'group', 'comment',
 	    'max_restart', 'max_relocate', 'type',
-	    'crm_state', 'request_state'
+	    'crm_state', 'request_state',
+	    {
+		name: 'vname',
+		convert: function(value, record) {
+		    let sid = record.data.sid;
+		    if (!sid) return '';
+
+		    let res = sid.match(/^(\S+):(\S+)$/);
+		    if (res[1] !== 'vm' && res[1] !== 'ct') {
+			return '-';
+		    }
+		    let vmid = res[2];
+		    return PVE.data.ResourceStore.guestName(vmid);
+		},
+	    },
 	],
 	idProperty: 'id'
     });