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 4C40B92801 for ; Tue, 14 Mar 2023 16:09:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E4692339B for ; Tue, 14 Mar 2023 16:08:46 +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 ; Tue, 14 Mar 2023 16:08:45 +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 BC3CB45C25 for ; Tue, 14 Mar 2023 16:08:44 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Tue, 14 Mar 2023 16:08:38 +0100 Message-Id: <20230314150839.248059-3-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314150839.248059-1-m.carrara@proxmox.com> References: <20230314150839.248059-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 Adjusted score from AWL reputation of From: address 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 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 v3 manager 2/3] ui: cert upload: use inputpanel for certificate upload 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: Tue, 14 Mar 2023 15:09:16 -0000 This change replaces the the certificate upload form's items with a single inputpanel widget. The components for the key and cert fields are preserved as-is. Hardcoded values are now explicitly set in `onGetValues` instead of using hidden widgets. Signed-off-by: Max Carrara --- www/manager6/node/Certificates.js | 96 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 51 deletions(-) diff --git a/www/manager6/node/Certificates.js b/www/manager6/node/Certificates.js index 34013b44..29c17359 100644 --- a/www/manager6/node/Certificates.js +++ b/www/manager6/node/Certificates.js @@ -166,62 +166,56 @@ Ext.define('PVE.node.CertUpload', { Ext.defer(() => window.location.reload(true), 10000); // reload after 10 seconds automatically }, - items: [ - { - fieldLabel: gettext('Private Key (Optional)'), - labelAlign: 'top', - emptyText: gettext('No change'), - name: 'key', - xtype: 'textarea', + items: { + xtype: 'inputpanel', + onGetValues: function(values) { + values.restart = 1; + values.force = 1; + return values; }, - { - xtype: 'filebutton', - text: gettext('From File'), - listeners: { - change: function(btn, e, value) { - let form = this.up('form'); - for (const file of e.event.target.files) { - PVE.Utils.loadFile(file, res => form.down('field[name=key]').setValue(res)); - } - btn.reset(); + items: [ + { + fieldLabel: gettext('Private Key (Optional)'), + labelAlign: 'top', + emptyText: gettext('No change'), + name: 'key', + xtype: 'textarea', + }, + { + xtype: 'filebutton', + text: gettext('From File'), + listeners: { + change: function(btn, e, value) { + let form = this.up('form'); + for (const file of e.event.target.files) { + PVE.Utils.loadFile(file, res => form.down('field[name=key]').setValue(res)); + } + btn.reset(); + }, }, }, - }, - { - xtype: 'box', - autoEl: 'hr', - }, - { - fieldLabel: gettext('Certificate Chain'), - labelAlign: 'top', - allowBlank: false, - name: 'certificates', - xtype: 'textarea', - }, - { - xtype: 'filebutton', - text: gettext('From File'), - listeners: { - change: function(btn, e, value) { - let form = this.up('form'); - for (const file of e.event.target.files) { - PVE.Utils.loadFile(file, res => form.down('field[name=certificates]').setValue(res)); - } - btn.reset(); + { + fieldLabel: gettext('Certificate Chain'), + labelAlign: 'top', + allowBlank: false, + name: 'certificates', + xtype: 'textarea', + }, + { + xtype: 'filebutton', + text: gettext('From File'), + listeners: { + change: function(btn, e, value) { + let form = this.up('form'); + for (const file of e.event.target.files) { + PVE.Utils.loadFile(file, res => form.down('field[name=certificates]').setValue(res)); + } + btn.reset(); + }, }, }, - }, - { - xtype: 'hidden', - name: 'restart', - value: '1', - }, - { - xtype: 'hidden', - name: 'force', - value: '1', - }, - ], + ], + }, initComponent: function() { let me = this; -- 2.39.2