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 1894E950D for ; Thu, 17 Nov 2022 15:56:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D5CDE2F6DB 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 5161044945 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:21 +0100 Message-Id: <20221117145623.661109-4-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 3/5] ui: tags: hide already set tags in dropdown 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 on every change, collect all tags and update the filter of all tag fields Signed-off-by: Dominik Csapak --- www/manager6/form/Tag.js | 2 +- www/manager6/form/TagEdit.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/www/manager6/form/Tag.js b/www/manager6/form/Tag.js index 9da0db951..8d003ca97 100644 --- a/www/manager6/form/Tag.js +++ b/www/manager6/form/Tag.js @@ -76,7 +76,7 @@ Ext.define('Proxmox.form.Tag', { }); } me.picker.getStore()?.clearFilter(); - let taglist = PVE.Utils.tagList.map(v => ({ tag: v })); + let taglist = PVE.Utils.tagList.filter(v => !me.filter.includes(v)).map(v => ({ tag: v })); if (taglist.length < 1) { return; } diff --git a/www/manager6/form/TagEdit.js b/www/manager6/form/TagEdit.js index 9015bd653..3806bbdf3 100644 --- a/www/manager6/form/TagEdit.js +++ b/www/manager6/form/TagEdit.js @@ -27,6 +27,7 @@ Ext.define('PVE.panel.TagEditContainer', { newtags.forEach((tag) => { me.addTag(tag); }); + me.updateFilter(); view.suspendLayout = false; view.updateLayout(); if (!force) { @@ -168,6 +169,19 @@ Ext.define('PVE.panel.TagEditContainer', { me.getView().updateLayout(); }, + updateFilter: function() { + let me = this; + let tags = []; + me.forEachTag(cmp => { + if (cmp.tag) { + tags.push(cmp.tag); + } + }); + me.forEachTag(cmp => { + cmp.updateFilter(tags); + }); + }, + addTag: function(tag, isNew) { let me = this; let view = me.getView(); @@ -191,6 +205,9 @@ Ext.define('PVE.panel.TagEditContainer', { tag, mode: vm.get('editMode') ? 'editable' : 'normal', listeners: { + change: (field, newTag) => { + me.updateFilter(); + }, destroy: function() { vm.set('tagCount', vm.get('tagCount') - 1); }, @@ -198,6 +215,7 @@ Ext.define('PVE.panel.TagEditContainer', { }); if (isNew) { + me.updateFilter(); tagField.selectText(); } -- 2.30.2