ui: ACME selectors - adapt to new API path/return schema

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/dc/ACMEPluginEdit.js b/www/manager6/dc/ACMEPluginEdit.js
index fd07017c18c58ebcbb52bb70ff5818ab3ebf151b..24c4d4078efcf659b152031ab3469eff6edf6465 100644 (file)
--- a/www/manager6/dc/ACMEPluginEdit.js
+++ b/www/manager6/dc/ACMEPluginEdit.js
@@ -49,8 +49,11 @@ Ext.define('PVE.dc.ACMEPluginEditor', {
 
                me.createdFields = {};
 
+               if (typeof schema.fields !== 'object') {
+                   schema.fields = {};
+               }
                // create custom fields according to schema
-               for (const [name, definition] of Object.entries(schema)) {
+               for (const [name, definition] of Object.entries(schema.fields)) {
                    let xtype;
                    switch (definition.type) {
                        case 'string':

diff --git a/www/manager6/form/ACMEAPiSelector.js b/www/manager6/form/ACMEAPiSelector.js
index 1ae4084970eafd564d82a864ccf4654fb66df55b..81a38b15c46609fccbc32a4fb7a75bba4fd03d05 100644 (file)
--- a/www/manager6/form/ACMEAPiSelector.js
+++ b/www/manager6/form/ACMEAPiSelector.js
@@ -1,11 +1,11 @@
 Ext.define('pve-acme-challenges', {
     extend: 'Ext.data.Model',
-    fields: ['name', 'schema'],
+    fields: ['id', 'type', 'schema'],
     proxy: {
        type: 'proxmox',
-           url: "/api2/json/cluster/acme/challengeschema",
+           url: "/api2/json/cluster/acme/challenge-schema",
     },
-    idProperty: 'name',
+    idProperty: 'id',
 });
 
 Ext.define('PVE.form.ACMEApiSelector', {
@@ -14,7 +14,7 @@ Ext.define('PVE.form.ACMEApiSelector', {
 
     fieldLabel: gettext('API'),
     displayField: 'name',
-    valueField: 'name',
+    valueField: 'id',
 
     store: {
        model: 'pve-acme-challenges',
@@ -30,7 +30,7 @@ Ext.define('PVE.form.ACMEApiSelector', {
        let me = this;
        let val = me.getValue();
        if (val) {
-           let record = me.getStore().findRecord('name', val);
+           let record = me.getStore().findRecord('id', val);
            if (record) {
                return record.data.schema;
            }