fix: remove duplicate column in sql query on manual sorting (#18626)

* fix: remove duplicate column in sql query on manual sorting

* fix: add check between default and normal sort, to avoid duplication in the query

---------

Co-authored-by: Giacomo Masseroni <[email protected]>

Author: giacomomasseron

packages/tables/src/Concerns/CanSortRecords.php

@@ -85,9 +85,11 @@ protected function applySortingToTableQuery(Builder $query): Builder
             return $query->orderBy($this->getTable()->getReorderColumn(), $this->getTable()->getReorderDirection());
         }
 
+        $tableSortColumn = $this->getTableSortColumn();
+
         if (
-            $this->getTableSortColumn() &&
-            $column = $this->getTable()->getSortableVisibleColumn($this->getTableSortColumn())
+            $tableSortColumn &&
+            $column = $this->getTable()->getSortableVisibleColumn($tableSortColumn)
         ) {
             $sortDirection = $this->getTableSortDirection() === 'desc' ? 'desc' : 'asc';
 
@@ -99,11 +101,14 @@ protected function applySortingToTableQuery(Builder $query): Builder
 
         if (
             is_string($defaultSort) &&
-            ($defaultSort !== $this->getTableSortColumn()) &&
+            ($defaultSort !== $tableSortColumn) &&
             ($sortColumn = $this->getTable()->getSortableVisibleColumn($defaultSort))
         ) {
             $sortColumn->applySort($query, $sortDirection);
-        } elseif (is_string($defaultSort)) {
+        } elseif (
+            is_string($defaultSort) &&
+            $defaultSort !== $tableSortColumn
+        ) {
             $query->orderBy($defaultSort, $sortDirection);
         }