From ba08eb00390325641acd92113c062a01dfd27e36 Mon Sep 17 00:00:00 2001
From: David <hi@davwheat.dev>
Date: Tue, 20 Jul 2021 20:53:27 +0100
Subject: [PATCH] Fix Select-based setting breaking admin pages

---
 .../core/js/src/admin/components/AdminPage.js | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/framework/core/js/src/admin/components/AdminPage.js b/framework/core/js/src/admin/components/AdminPage.js
index c5f3496a1..8ecfbdd12 100644
--- a/framework/core/js/src/admin/components/AdminPage.js
+++ b/framework/core/js/src/admin/components/AdminPage.js
@@ -98,39 +98,37 @@ export default class AdminPage extends Page {
       return entry.call(this);
     }
 
-    const { setting, help, ...componentAttrs } = entry;
+    const { setting, help, type, label, ...componentAttrs } = entry;
 
-    const value = this.setting([setting])();
-    if (['bool', 'checkbox', 'switch', 'boolean'].includes(componentAttrs.type)) {
+    const value = this.setting(setting)();
+
+    if (['bool', 'checkbox', 'switch', 'boolean'].includes(type)) {
       return (
         <div className="Form-group">
           <Switch state={!!value && value !== '0'} onchange={this.settings[setting]} {...componentAttrs}>
-            {componentAttrs.label}
+            {label}
           </Switch>
           <div className="helpText">{help}</div>
         </div>
       );
-    } else if (['select', 'dropdown', 'selectdropdown'].includes(componentAttrs.type)) {
+    } else if (['select', 'dropdown', 'selectdropdown'].includes(type)) {
+      const { default: defaultValue, options } = componentAttrs;
+
       return (
         <div className="Form-group">
-          <label>{componentAttrs.label}</label>
+          <label>{label}</label>
           <div className="helpText">{help}</div>
-          <Select
-            value={value || componentAttrs.default}
-            options={componentAttrs.options}
-            buttonClassName="Button"
-            onchange={this.settings[setting]}
-            {...componentAttrs}
-          />
+          <Select value={value || defaultValue} options={options} onchange={this.settings[setting]} {...componentAttrs} />
         </div>
       );
     } else {
       componentAttrs.className = classList(['FormControl', componentAttrs.className]);
+
       return (
         <div className="Form-group">
-          {componentAttrs.label ? <label>{componentAttrs.label}</label> : ''}
+          {label ? <label>{label}</label> : ''}
           <div className="helpText">{help}</div>
-          <input type={componentAttrs.type} bidi={this.setting(setting)} {...componentAttrs} />
+          <input type={type} bidi={this.setting(setting)} {...componentAttrs} />
         </div>
       );
     }