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 E231A822D for ; Wed, 21 Jun 2023 09:42:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1E4C195E9 for ; Wed, 21 Jun 2023 09:41:44 +0200 (CEST) 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 ; Wed, 21 Jun 2023 09:41:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5671B42338 for ; Wed, 21 Jun 2023 09:41:43 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 21 Jun 2023 09:41:40 +0200 Message-Id: <20230621074142.742461-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230621074142.742461-1-d.csapak@proxmox.com> References: <20230621074142.742461-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [values.map] Subject: [pve-devel] [PATCH manager v2 3/5] ui: pci/usb map edit: improve new host mappings dialog 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: Wed, 21 Jun 2023 07:42:14 -0000 by disallowing nodes to be selected where a mapping already exists Signed-off-by: Dominik Csapak --- changes from v1: * dont' disable autoselect, the first allowed node will be selected * for usb mappings too www/manager6/window/PCIMapEdit.js | 9 ++++++++- www/manager6/window/USBMapEdit.js | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/www/manager6/window/PCIMapEdit.js b/www/manager6/window/PCIMapEdit.js index 8c1a95e3..f243362b 100644 --- a/www/manager6/window/PCIMapEdit.js +++ b/www/manager6/window/PCIMapEdit.js @@ -58,7 +58,13 @@ Ext.define('PVE.window.PCIMapEditWindow', { let me = this; let view = me.getView(); me.originalMap = [...values.map]; - values.map = PVE.Parser.filterPropertyStringList(values.map, (e) => e.node === view.nodename); + let configuredNodes = []; + values.map = PVE.Parser.filterPropertyStringList(values.map, (e) => { + configuredNodes.push(e.node); + return e.node === view.nodename; + }); + + me.lookup('nodeselector').disallowedNodes = configuredNodes; return values; }, @@ -203,6 +209,7 @@ Ext.define('PVE.window.PCIMapEditWindow', { name: 'node', editConfig: { xtype: 'pveNodeSelector', + reference: 'nodeselector', }, cbind: { editable: '{!nodename}', diff --git a/www/manager6/window/USBMapEdit.js b/www/manager6/window/USBMapEdit.js index 80f8e785..f36f1d03 100644 --- a/www/manager6/window/USBMapEdit.js +++ b/www/manager6/window/USBMapEdit.js @@ -71,13 +71,16 @@ Ext.define('PVE.window.USBMapEditWindow', { let me = this; let view = me.getView(); me.originalMap = [...values.map]; + let configuredNodes = []; PVE.Parser.filterPropertyStringList(values.map, (e) => { + configuredNodes.push(e.node); if (e.node === view.nodename) { values = e; } return false; }); + me.lookup('nodeselector').disallowedNodes = configuredNodes; if (values.path) { values.usb = 'path'; } @@ -145,6 +148,7 @@ Ext.define('PVE.window.USBMapEditWindow', { name: 'node', editConfig: { xtype: 'pveNodeSelector', + reference: 'nodeselector', }, cbind: { editable: '{!nodename}', -- 2.30.2