From 56e7fc7b9daf2fd3124beb54f72b9d0b1dee244a Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 5 May 2020 19:24:44 +0200
Subject: [PATCH] ui: ACME selectors - adapt to new API path/return schema

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 www/manager6/dc/ACMEPluginEdit.js    |  5 ++++-
 www/manager6/form/ACMEAPiSelector.js | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/www/manager6/dc/ACMEPluginEdit.js b/www/manager6/dc/ACMEPluginEdit.js
index fd07017c..24c4d407 100644
--- 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 1ae40849..81a38b15 100644
--- 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;
 	    }