Remove orthogonal from QueryDataTable. Only Collection.

Signed-off-by: Dmitry Mazurov <[email protected]>

Author: dima-bzz

src/DataTableAbstract.php

@@ -882,11 +882,11 @@ protected function setupKeyword($value)
      * Get column name to be use for filtering and sorting.
      *
      * @param int  $index
-     * @param string $type
+     * @param string|null $type
      * @param bool $wantsAlias
      * @return string
      */
-    protected function getColumnName($index, $type, $wantsAlias = false)
+    protected function getColumnName($index, $type = null, $wantsAlias = false)
     {
         $column = $this->request->columnName($index, $type);
 

src/QueryDataTable.php

@@ -280,7 +280,7 @@ public function columnSearch()
         $columns = $this->request->columns();
 
         foreach ($columns as $index => $column) {
-            $column = $this->getColumnName($index, 'filter');
+            $column = $this->getColumnName($index);
 
             if (! $this->request->isColumnSearchable($index) || $this->isBlacklisted($column) && ! $this->hasFilterColumn($column)) {
                 continue;
@@ -635,7 +635,7 @@ protected function defaultOrdering()
     {
         collect($this->request->orderableColumns())
             ->map(function ($orderable) {
-                $orderable['name'] = $this->getColumnName($orderable['column'], 'sort', true);
+                $orderable['name'] = $this->getColumnName($orderable['column'], null, true);
 
                 return $orderable;
             })
@@ -713,7 +713,7 @@ protected function globalSearch($keyword)
         $this->query->where(function ($query) use ($keyword) {
             collect($this->request->searchableColumnIndex())
                 ->map(function ($index) {
-                    return $this->getColumnName($index, 'filter');
+                    return $this->getColumnName($index);
                 })
                 ->reject(function ($column) {
                     return $this->isBlacklisted($column) && ! $this->hasFilterColumn($column);

src/Utilities/Request.php

@@ -213,14 +213,14 @@ public function keyword()
      * Get column identity from input or database.
      *
      * @param int $i
-     * @param string $type
+     * @param string|null $type
      * @return string
      */
-    public function columnName($i, $type)
+    public function columnName($i, $type = null)
     {
         $column = $this->request->input("columns.$i");
 
-        if (isset($column['data']) && is_array($column['data'])) {
+        if (isset($type) && isset($column['data']) && is_array($column['data'])) {
             if (isset($column['data'][$type]) && $column['data'][$type] != '') {
                 return $column['data'][$type];
             }

tests/Unit/RequestTest.php

@@ -115,8 +115,8 @@ public function test_searchable_column_index()
     public function test_searchable_with_filter_column_index()
     {
         $_GET['columns']   = [];
-        $_GET['columns'][] = ['name' => 'foo', 'data' => ['_' => 'foo', 'filter' => 'foo.sort'], 'searchable' => 'true', 'search' => ['value' => 'foo']];
-        $_GET['columns'][] = ['name' => 'bar', 'data' => ['_' => 'bar', 'filter' => 'bar.sort'], 'searchable' => 'false', 'search' => ['value' => 'foo']];
+        $_GET['columns'][] = ['name' => 'foo', 'data' => ['_' => 'foo', 'filter' => 'foo.filter'], 'searchable' => 'true', 'search' => ['value' => 'foo']];
+        $_GET['columns'][] = ['name' => 'bar', 'data' => ['_' => 'bar', 'filter' => 'bar.filter'], 'searchable' => 'false', 'search' => ['value' => 'foo']];
         request()->merge($_GET);
         $request = $this->getRequest();
         $this->assertEquals([0], $request->searchableColumnIndex());
@@ -127,8 +127,8 @@ public function test_searchable_with_filter_column_index()
         $this->assertTrue($request->isColumnSearchable(0, true));
         $this->assertFalse($request->isColumnSearchable(1, false));
 
-        $this->assertEquals('foo.sort', $request->columnName(0, 'filter'));
-        $this->assertEquals('bar.sort', $request->columnName(1, 'filter'));
+        $this->assertEquals('foo.filter', $request->columnName(0, 'filter'));
+        $this->assertEquals('bar.filter', $request->columnName(1, 'filter'));
     }
 
     public function test_keyword()