Fix search panes and options

Author: yajra

src/Html/Editor/Fields/Options.php

@@ -33,7 +33,7 @@ public static function yesNo(): static
     /**
      * Get options from a model.
      *
-     * @param  class-string|\Illuminate\Database\Eloquent\Builder  $model
+     * @param  class-string<Model>|\Illuminate\Database\Eloquent\Builder  $model
      * @param  string  $value
      * @param  string  $key
      * @return Collection
@@ -71,13 +71,18 @@ public static function table(
     ): Collection {
         $query = DB::connection($connection)
                    ->table($table)
-                   ->select("{$value} as label", "$key as value");
+                   ->select("$value as label", "$key as value");
 
         if (is_callable($callback)) {
             $callback($query);
         }
 
-        return $query->get();
+        return $query->get()->map(function ($row) use ($value, $key) {
+            return [
+                'value' => $row->value,
+                'label' => $row->label,
+            ];
+        });
     }
 
     /**

src/Html/SearchPane.php

@@ -211,7 +211,7 @@ public function hideTotal(bool $value = true): static
     /**
      * Get options from a model.
      *
-     * @param  class-string|EloquentBuilder  $model
+     * @param  class-string<\Illuminate\Database\Eloquent\Model>|EloquentBuilder  $model
      * @param  string  $value
      * @param  string  $key
      * @return $this

tests/SearchPaneTest.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Yajra\DataTables\Html\Tests;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\Html\SearchPane;
+use Yajra\DataTables\Html\Tests\Models\User;
+
+class SearchPaneTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_has_setters()
+    {
+        $pane = SearchPane::make();
+        $pane->className('className')
+             ->header('header')
+             ->show()
+             ->name('name')
+             ->orthogonal('orthogonal')
+             ->hideTotal()
+             ->threshold(1)
+             ->hideCount()
+             ->filterChanged('filterChanged')
+             ->emptyMessage('emptyMessage')
+             ->dtOpts([])
+             ->controls()
+             ->columns([])
+             ->clear()
+             ->cascadePanes();
+
+        $this->assertInstanceOf(SearchPane::class, $pane);
+        $this->assertEquals('className', $pane->className);
+        $this->assertEquals('header', $pane->header);
+        $this->assertEquals(true, $pane->show);
+        $this->assertEquals('name', $pane->name);
+        $this->assertEquals('orthogonal', $pane->orthogonal);
+        $this->assertEquals(false, $pane->viewTotal);
+        $this->assertEquals(1, $pane->threshold);
+        $this->assertEquals(true, $pane->hideCount);
+        $this->assertEquals('filterChanged', $pane->filterChanged);
+        $this->assertEquals('emptyMessage', $pane->emptyMessage);
+        $this->assertEquals([], $pane->dtOpts);
+        $this->assertEquals(true, $pane->controls);
+        $this->assertEquals([], $pane->columns);
+        $this->assertEquals(true, $pane->clear);
+        $this->assertEquals(true, $pane->cascadePanes);
+
+        $pane->viewTotal();
+        $this->assertEquals(true, $pane->viewTotal);
+    }
+
+    /** @test */
+    public function it_has_options()
+    {
+        $pane = SearchPane::make()->options([1, 2, 3]);
+
+        $this->assertEquals([1, 2, 3], $pane->options);
+        $this->assertCount(3, $pane->options);
+
+        $pane->modelOptions(User::class, 'name');
+        $this->assertCount(20, $pane->options);
+        $this->assertIsArray($pane->options[0]);
+        $this->assertEquals(['value' => 1, 'label' => 'Record-1'], $pane->options[0]);
+        $this->assertEquals(['value' => 10, 'label' => 'Record-10'], $pane->options[9]);
+
+        $pane->tableOptions('users', 'name');
+        $this->assertCount(20, $pane->options);
+        $this->assertIsArray($pane->options[0]);
+        $this->assertEquals(['value' => 1, 'label' => 'Record-1'], $pane->options[0]);
+        $this->assertEquals(['value' => 10, 'label' => 'Record-10'], $pane->options[9]);
+    }
+}