From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 604D91FF17A for ; Fri, 4 Jul 2025 20:17:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BC303CC8C; Fri, 4 Jul 2025 20:17:24 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Fri, 4 Jul 2025 20:16:58 +0200 Message-Id: <20250704181659.465441-20-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250704181659.465441-1-d.kral@proxmox.com> References: <20250704181659.465441-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 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 Subject: [pve-devel] [PATCH manager v3 2/3] ui: ha: remove ha groups from ha resource components 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" Remove the HA group column from the HA Resources grid view and the HA group selector from the HA Resources edit window, as these will be replaced by semantically equivalent HA node affinity rules in the next patch. Add the field 'failback' that is moved to the HA Resources config as part of the migration from groups to node affinity rules. Signed-off-by: Daniel Kral --- www/manager6/ha/ResourceEdit.js | 16 ++++++++++++---- www/manager6/ha/Resources.js | 17 ----------------- www/manager6/ha/StatusView.js | 1 - 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/www/manager6/ha/ResourceEdit.js b/www/manager6/ha/ResourceEdit.js index 1048ccca..428672a8 100644 --- a/www/manager6/ha/ResourceEdit.js +++ b/www/manager6/ha/ResourceEdit.js @@ -11,7 +11,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { } delete values.vmid; - PVE.Utils.delete_if_default(values, 'group', '', me.isCreate); + PVE.Utils.delete_if_default(values, 'failback', '1', me.isCreate); PVE.Utils.delete_if_default(values, 'max_restart', '1', me.isCreate); PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.isCreate); @@ -110,9 +110,17 @@ Ext.define('PVE.ha.VMResourceInputPanel', { me.column2 = [ { - xtype: 'pveHAGroupSelector', - name: 'group', - fieldLabel: gettext('Group'), + xtype: 'proxmoxcheckbox', + name: 'failback', + fieldLabel: gettext('Failback'), + autoEl: { + tag: 'div', + 'data-qtip': gettext( + 'Enable if HA resource should automatically adjust to HA rules.', + ), + }, + uncheckedValue: 0, + value: 1, }, { xtype: 'proxmoxKVComboBox', diff --git a/www/manager6/ha/Resources.js b/www/manager6/ha/Resources.js index e8e53b3b..097097dc 100644 --- a/www/manager6/ha/Resources.js +++ b/www/manager6/ha/Resources.js @@ -136,23 +136,6 @@ Ext.define('PVE.ha.ResourcesView', { renderer: (v) => (v === undefined ? '1' : v), dataIndex: 'max_relocate', }, - { - header: gettext('Group'), - width: 200, - sortable: true, - renderer: function (value, metaData, { data }) { - if (data.errors && data.errors.group) { - metaData.tdCls = 'proxmox-invalid-row'; - let html = Ext.htmlEncode( - `

${Ext.htmlEncode(data.errors.group)}

`, - ); - metaData.tdAttr = - 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html + '"'; - } - return value; - }, - dataIndex: 'group', - }, { header: gettext('Description'), flex: 1, diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js index 3e3205a5..a3ca9fdf 100644 --- a/www/manager6/ha/StatusView.js +++ b/www/manager6/ha/StatusView.js @@ -78,7 +78,6 @@ Ext.define( 'status', 'sid', 'state', - 'group', 'comment', 'max_restart', 'max_relocate', -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel