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 9EFD891716 for ; Mon, 14 Nov 2022 10:44:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E4020210FE for ; Mon, 14 Nov 2022 10:44:14 +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 ; Mon, 14 Nov 2022 10:44:10 +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 6BFED43D2D for ; Mon, 14 Nov 2022 10:44:07 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 14 Nov 2022 10:43:55 +0100 Message-Id: <20221114094404.1241050-12-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114094404.1241050-1-d.csapak@proxmox.com> References: <20221114094404.1241050-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 v9 03/12] ui: call '/ui-options' and save the result in PVE.UIOptions 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: Mon, 14 Nov 2022 09:44:45 -0000 and move the use of the console from VersionInfo to here, since this will be the future place for ui related backend options. Signed-off-by: Dominik Csapak --- changes from v8: * moved the logic into Utils, since we'll want to use that more regularly www/manager6/Utils.js | 12 +++++++++++- www/manager6/Workspace.js | 2 ++ www/manager6/dc/OptionView.js | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index adcf082ff..29bf667b4 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1332,7 +1332,7 @@ Ext.define('PVE.Utils', { allowSpice = consoles.spice; allowXtermjs = !!consoles.xtermjs; } - let dv = PVE.VersionInfo.console || (type === 'kvm' ? 'vv' : 'xtermjs'); + let dv = PVE.UIOptions.console || (type === 'kvm' ? 'vv' : 'xtermjs'); if (dv === 'vv' && !allowSpice) { dv = allowXtermjs ? 'xtermjs' : 'html5'; } else if (dv === 'xtermjs' && !allowXtermjs) { @@ -1854,6 +1854,16 @@ Ext.define('PVE.Utils', { }, notesTemplateVars: ['cluster', 'guestname', 'node', 'vmid'], + + updateUIOptions: function() { + Proxmox.Utils.API2Request({ + url: '/ui-options', + method: 'GET', + success: function(response) { + PVE.UIOptions = response?.result?.data ?? {}; + }, + }); + }, }, singleton: true, diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index 2bb502e0c..a7423508e 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -158,6 +158,8 @@ Ext.define('PVE.StdWorkspace', { }, }); + PVE.Utils.updateUIOptions(); + Proxmox.Utils.API2Request({ url: '/cluster/sdn', method: 'GET', diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index 5a2be182e..ff96351d5 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -343,9 +343,9 @@ Ext.define('PVE.dc.OptionView', { } var rec = store.getById('console'); - PVE.VersionInfo.console = rec.data.value; + PVE.UIOptions.console = rec.data.value; if (rec.data.value === '__default__') { - delete PVE.VersionInfo.console; + delete PVE.UIOptions.console; } }); -- 2.30.2