ChannelForm: Render default values as element values

Instead of rendering default values as placeholders, render them as form element values.
Icinga · Apr 11, 2024 · 6fc00d4 · 6fc00d4
1 parent 110764e
commit 6fc00d4
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/application/forms/ChannelForm.php b/application/forms/ChannelForm.php
@@ -28,6 +28,9 @@ class ChannelForm extends CompatForm
     /** @var ?int Channel ID */
     private $channelId;
 
+    /** @var array<string, mixed> */
+    private $defaultChannelOptions = [];
+
     public function __construct(Connection $db, ?int $channelId = null)
     {
         $this->db = $db;
@@ -161,7 +164,14 @@ protected function onSuccess()
         }
 
         $channel = $this->getValues();
-        $channel['config'] = json_encode($channel['config']);
+        $config = $channel['config'];
+        foreach ($this->defaultChannelOptions as $key => $value) {
+            if (array_key_exists($key, $config) && $config[$key] === $value) {
+                $config[$key] = null;
+            }
+        }
+
+        $channel['config'] = json_encode($config);
         if ($this->channelId === null) {
             $this->db->insert('channel', $channel);
         } else {
@@ -188,17 +198,25 @@ protected function createConfigElements(string $type, string $config): void
         $this->addElement($configFieldset);
 
         foreach ($elementsConfig as $elementConfig) {
+            $elemOptions = $this->getElementOptions($elementConfig);
             /** @var BaseFormElement $elem */
             $elem = $this->createElement(
                 $this->getElementType($elementConfig),
                 $elementConfig->name,
-                $this->getElementOptions($elementConfig)
+                $elemOptions
             );
 
             if ($type === "email" && $elem->getName() === "sender_mail") {
                 $elem->getValidators()->add(new EmailAddressValidator());
             }
 
+            if (
+                isset($elementConfig->default)
+                && $configFieldset->getPopulatedValue($elementConfig->name) === null
+            ) {
+                $configFieldset->clearPopulatedValue($elementConfig->name);
+            }
+
             $configFieldset->addElement($elem);
         }
     }
@@ -270,11 +288,8 @@ protected function getElementOptions(stdClass $elementConfig): array
         }
 
         if (isset($elementConfig->default)) {
-            if ($isSelectElement || $elementConfig->type === 'bool') {
-                $options['value'] = $elementConfig->default;
-            } else {
-                $options['placeholder'] = $elementConfig->default;
-            }
+            $this->defaultChannelOptions[$elementConfig->name] = $elementConfig->default;
+            $options['value'] = $elementConfig->default;
         }
 
         if ($elementConfig->type === "number") {