[pve-devel] [PATCH manager v8 03/12] ui: call '/ui-options' and save the result in PVE.UIOptions

[Dominik Csapak]

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 <d.csa...@proxmox.com>
---
 www/manager6/Utils.js         |  2 +-
 www/manager6/Workspace.js     | 13 +++++++++++++
 www/manager6/dc/OptionView.js |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 7ca6a271..3c8c1417 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) {
diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js
index 2bb502e0..7e17964e 100644
--- a/www/manager6/Workspace.js
+++ b/www/manager6/Workspace.js
@@ -158,6 +158,14 @@ Ext.define('PVE.StdWorkspace', {
                },
            });
 
+           Proxmox.Utils.API2Request({
+               url: '/ui-options',
+               method: 'GET',
+               success: function(response) {
+                   me.updateUIOptions(response.result.data);
+               },
+           });
+
            Proxmox.Utils.API2Request({
                url: '/cluster/sdn',
                method: 'GET',
@@ -213,6 +221,11 @@ Ext.define('PVE.StdWorkspace', {
        ui.updateLayout();
     },
 
+    updateUIOptions: function(data) {
+       let me = this;
+       PVE.UIOptions = data ?? {};
+    },
+
     initComponent: function() {
        let me = this;
 
diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js
index 5a2be182..ff96351d 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



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel