From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EA94794CF for ; Thu, 17 Nov 2022 15:56:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD5DB2F6D8 for ; Thu, 17 Nov 2022 15:56:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 17 Nov 2022 15:56:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3AAF744D7F for ; Thu, 17 Nov 2022 15:56:24 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 15:56:20 +0100 Message-Id: <20221117145623.661109-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221117145623.661109-1-d.csapak@proxmox.com> References: <20221117145623.661109-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.065 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 2/5] ui: tags: make sorting more natural 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: , X-List-Received-Date: Thu, 17 Nov 2022 14:56:57 -0000 by sorting the lower cased variants, and only if they are identical sort the original values with 'localeCompare' Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 6 +++++- www/manager6/form/TagEdit.js | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index e4b6207c6..9ceda0a97 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1941,7 +1941,11 @@ Ext.define('PVE.Utils', { if (tagstext) { let tags = (tagstext.split(/[,; ]/) || []).filter(t => !!t); if (PVE.Utils.shouldSortTags()) { - tags = tags.sort(); + tags = tags.sort((a,b) => { + let alc = a.toLowerCase(); + let blc = b.toLowerCase(); + return alc < blc ? -1 : blc < alc ? 1 : a.localeCompare(b); + }); } text += ' '; tags.forEach((tag) => { diff --git a/www/manager6/form/TagEdit.js b/www/manager6/form/TagEdit.js index 4e3fec384..9015bd653 100644 --- a/www/manager6/form/TagEdit.js +++ b/www/manager6/form/TagEdit.js @@ -181,7 +181,9 @@ Ext.define('PVE.panel.TagEditContainer', { if (tagField.xtype !== 'pveTag') { return true; } - return tagField.tag >= tag; + let a = tagField.tag.toLowerCase() + let b = tag.toLowerCase(); + return a > b ? true : a < b ? false : tagField.tag.localeCompare(tag) > 0; }, 1); } let tagField = view.insert(index, { -- 2.30.2