Allow options of optional form fields to only define an id fixes #162

Author: dvlpp

src/Form/Fields/SharpFormAutocompleteField.php

@@ -300,7 +300,7 @@ public function toArray(): array
                 "placeholder" => $this->placeholder,
                 "localValues" => $this->isLocal() && $this->dynamicAttributes
                     ? self::formatDynamicOptions($this->localValues, count($this->dynamicAttributes[0]["path"]))
-                    : ($this->isLocal() ? self::formatOptions($this->localValues) : []),
+                    : ($this->isLocal() ? self::formatOptions($this->localValues, $this->itemIdAttribute) : []),
                 "itemIdAttribute" => $this->itemIdAttribute,
                 "searchKeys" => $this->localSearchKeys,
                 "remoteEndpoint" => $this->remoteEndpoint,

src/Form/Fields/SharpFormSelectField.php

@@ -208,7 +208,7 @@ public function toArray(): array
             array_merge([
                 "options" => $this->dynamicAttributes
                     ? self::formatDynamicOptions($this->options, count($this->dynamicAttributes[0]["path"]))
-                    : self::formatOptions($this->options),
+                    : self::formatOptions($this->options, $this->idAttribute),
                 "multiple" => $this->multiple,
                 "clearable" => $this->clearable,
                 "display" => $this->display,

src/Form/Fields/Utils/SharpFormFieldWithOptions.php

@@ -9,9 +9,10 @@ trait SharpFormFieldWithOptions
 
     /**
      * @param array|Collection $options
+     * @param string $idAttribute
      * @return array
      */
-    protected static function formatOptions($options)
+    protected static function formatOptions($options, $idAttribute = "id")
     {
         if(! sizeof($options)) {
             return [];
@@ -20,7 +21,7 @@ protected static function formatOptions($options)
         $options = collect($options);
 
         if((is_array($options->first()) || is_object($options->first()))
-            && isset(((array)$options->first())["id"])) {
+            && isset(((array)$options->first())[$idAttribute])) {
             // We assume that we already have ["id", "label"] in this case
             return $options->all();
         }

tests/Unit/Form/Fields/SharpFormSelectFieldTest.php

@@ -117,6 +117,23 @@ function we_can_define_options_as_a_id_label_array()
         );
     }
 
+    /** @test */
+    function we_can_define_options_as_a_custom_array()
+    {
+        $formField = $this->getDefaultSelect([
+            ["key" => "Elem-1"],
+            ["key" => "Elem-2"],
+        ])->setIdAttribute("key");
+
+        $this->assertArrayContainsSubset(
+            ["options" => [
+                ["key" => "Elem-1"],
+                ["key" => "Elem-2"],
+            ]],
+            $formField->toArray()
+        );
+    }
+
     /** @test */
     function we_can_define_localized_options()
     {