From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C35D81FF168 for ; Tue, 12 Nov 2024 12:45:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B1331E6DC; Tue, 12 Nov 2024 12:45:39 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 12 Nov 2024 12:45:04 +0100 Message-Id: <20241112114506.1970103-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 1/3] ui: resource tree: fix order of types X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" when ordering items on the same level, we often sort first by type, but do this via string comparison of the types. this leads to weird results if we have e.g. lxc/node/qemu mixed in one list, as nodes would sort in between lxc and qemu this patch solves that issue by introducing a fixed order for types, so we have direct control over the order when mixing types without having to change the type names. Signed-off-by: Dominik Csapak --- www/manager6/tree/ResourceTree.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index 7b0c5dc8..640ebbf9 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -45,6 +45,18 @@ Ext.define('PVE.tree.ResourceTree', { useArrows: true, + // private + getTypeOrder: function(type) { + switch (type) { + case 'lxc': return 0; + case 'qemu': return 1; + case 'node': return 2; + case 'sdn': return 3; + case 'storage': return 4; + default: return 9; + } + }, + // private nodeSortFn: function(node1, node2) { let me = this; @@ -55,10 +67,9 @@ Ext.define('PVE.tree.ResourceTree', { let n2IsGuest = n2.type === 'qemu' || n2.type === 'lxc'; if (me['group-guest-types'] || !n1IsGuest || !n2IsGuest) { // first sort (group) by type - if (n1.type > n2.type) { - return 1; - } else if (n1.type < n2.type) { - return -1; + let res = me.getTypeOrder(n1.type) - me.getTypeOrder(n2.type); + if (res !== 0) { + return res; } } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel