Fix field options with tests

Author: yajra

src/Html/Editor/Fields/Field.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Fluent;
 use Illuminate\Support\Str;
@@ -108,12 +109,12 @@ public function type(string $type): static
     /**
      * Get options from a model.
      *
-     * @param  class-string|\Illuminate\Database\Eloquent\Builder  $model
+     * @param  \Illuminate\Database\Eloquent\Builder|class-string<\Illuminate\Database\Eloquent\Model>  $model
      * @param  string  $value
      * @param  string  $key
      * @return $this
      */
-    public function modelOptions($model, string $value, string $key = 'id'): static
+    public function modelOptions(Builder|string $model, string $value, string $key = 'id'): static
     {
         return $this->options(
             Options::model($model, $value, $key)

src/Html/Editor/Fields/Options.php

@@ -77,11 +77,8 @@ public static function table(
             $callback($query);
         }
 
-        return $query->get()->map(function ($row) use ($value, $key) {
-            return [
-                'value' => $row->value,
-                'label' => $row->label,
-            ];
+        return $query->get()->map(function ($row) {
+            return (array) $row;
         });
     }
 

tests/FieldOptionsTest.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Yajra\DataTables\Html\Tests;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\DB;
+use Yajra\DataTables\Html\Editor\Fields\Options;
+use Yajra\DataTables\Html\Tests\Models\User;
+
+class FieldOptionsTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_has_true_false()
+    {
+        $options = Options::trueFalse();
+
+        $this->assertEquals([
+            ['label' => __('True'), 'value' => 1],
+            ['label' => __('False'), 'value' => 0],
+        ], $options->toArray());
+    }
+
+    /** @test */
+    public function it_has_yes_no()
+    {
+        $options = Options::yesNo();
+
+        $this->assertEquals([
+            ['label' => __('Yes'), 'value' => 1],
+            ['label' => __('No'), 'value' => 0],
+        ], $options->toArray());
+    }
+
+    /** @test */
+    public function it_can_append_and_prepend()
+    {
+        $options = Options::yesNo();
+
+        $this->assertEquals([
+            ['label' => __('Yes'), 'value' => 1],
+            ['label' => __('No'), 'value' => 0],
+        ], $options->toArray());
+
+        $options->append(__('Maybe'), 2);
+        $this->assertEquals([
+            ['label' => __('Yes'), 'value' => 1],
+            ['label' => __('No'), 'value' => 0],
+            ['label' => __('Maybe'), 'value' => 2],
+        ], $options->toArray());
+
+        $options->prepend(__('IDK'), 3);
+        $this->assertEquals([
+            ['label' => __('IDK'), 'value' => 3],
+            ['label' => __('Yes'), 'value' => 1],
+            ['label' => __('No'), 'value' => 0],
+            ['label' => __('Maybe'), 'value' => 2],
+        ], $options->toArray());
+    }
+
+    /** @test */
+    public function it_can_get_options_from_table()
+    {
+        $options = Options::table('users', 'name');
+        $this->assertCount(20, $options);
+    }
+
+    /** @test */
+    public function it_can_get_options_from_query()
+    {
+        $options = Options::table(DB::table('users')->where('id', 1), 'name');
+        $this->assertCount(1, $options);
+    }
+
+    /** @test */
+    public function it_can_get_options_from_model()
+    {
+        $options = Options::model(User::class, 'name');
+        $this->assertCount(20, $options);
+    }
+
+    /** @test */
+    public function it_can_get_options_from_model_builder()
+    {
+        $options = Options::model(User::query()->whereKey(1), 'name');
+        $this->assertCount(1, $options);
+    }
+}