Merge pull request #2380 from dima-bzz/orthogonal

Added orthogonal sort and filter for collection

Author: yajra

src/CollectionDataTable.php

@@ -100,7 +100,7 @@ public function columnSearch()
     {
         $columns = $this->request->get('columns', []);
         for ($i = 0, $c = count($columns); $i < $c; $i++) {
-            $column  = $this->getColumnName($i);
+            $column  = $this->getColumnName($i, 'filter');
 
             if (! $this->request->isColumnSearchable($i) || $this->isBlacklisted($column)) {
                 continue;
@@ -230,7 +230,7 @@ protected function globalSearch($keyword)
 
             $data = $this->serialize($row);
             foreach ($this->request->searchableColumnIndex() as $index) {
-                $column = $this->getColumnName($index);
+                $column = $this->getColumnName($index, 'sort');
                 $value = Arr::get($data, $column);
                 if (! $value || is_array($value)) {
                     if (! is_numeric($value)) {
@@ -285,7 +285,7 @@ protected function getSorter(array $criteria)
     {
         $sorter = function ($a, $b) use ($criteria) {
             foreach ($criteria as $orderable) {
-                $column    = $this->getColumnName($orderable['column']);
+                $column    = $this->getColumnName($orderable['column'], 'sort');
                 $direction = $orderable['direction'];
                 if ($direction === 'desc') {
                     $first  = $b;

src/DataTableAbstract.php

@@ -939,13 +939,14 @@ protected function setupKeyword($value)
     /**
      * Get column name to be use for filtering and sorting.
      *
-     * @param  int  $index
-     * @param  bool  $wantsAlias
+     * @param int  $index
+     * @param string|null $type
+     * @param bool $wantsAlias
      * @return string
      */
-    protected function getColumnName($index, $wantsAlias = false)
+    protected function getColumnName($index, $type = null, $wantsAlias = false)
     {
-        $column = $this->request->columnName($index);
+        $column = $this->request->columnName($index, $type);
 
         // DataTables is using make(false)
         if (is_numeric($column)) {

src/QueryDataTable.php

@@ -660,7 +660,7 @@ protected function defaultOrdering()
     {
         collect($this->request->orderableColumns())
             ->map(function ($orderable) {
-                $orderable['name'] = $this->getColumnName($orderable['column'], true);
+                $orderable['name'] = $this->getColumnName($orderable['column'], null, true);
 
                 return $orderable;
             })

src/Utilities/Request.php

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

tests/Unit/RequestTest.php

@@ -112,6 +112,25 @@ public function test_searchable_column_index()
         $this->assertEquals('bar', $request->columnName(1));
     }
 
+    public function test_searchable_with_filter_column_index()
+    {
+        $_GET['columns']   = [];
+        $_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());
+
+        $this->assertTrue($request->isColumnSearchable(0, false));
+        $this->assertFalse($request->isColumnSearchable(1, false));
+
+        $this->assertTrue($request->isColumnSearchable(0, true));
+        $this->assertFalse($request->isColumnSearchable(1, false));
+
+        $this->assertEquals('foo.filter', $request->columnName(0, 'filter'));
+        $this->assertEquals('bar.filter', $request->columnName(1, 'filter'));
+    }
+
     public function test_keyword()
     {
         $_GET['search'] = [];