refactor to remove extra property

Author: inmanturbo

src/DataTableComponent.php

@@ -66,6 +66,7 @@ public function boot(): void
         $this->{$this->tableName} = [
             'sorts' => $this->{$this->tableName}['sorts'] ?? [],
             'filters' => $this->{$this->tableName}['filters'] ?? [],
+            'columns' => $this->{$this->tableName}['columns'] ?? [],
         ];
 
         // Set the filter defaults based on the filter type

src/Traits/ComponentUtilities.php

@@ -14,7 +14,6 @@ trait ComponentUtilities
 
     public array $table = [];
     public $theme = null;
-    public array $userSelectedColumns = [];
     protected Builder $builder;
     protected $model;
     protected $primaryKey;
@@ -58,7 +57,6 @@ public function queryString(): array
         if ($this->queryStringIsEnabled()) {
             return [
                 $this->getTableName() => ['except' => null, 'as' => $this->dataTableFingerprint()],
-                'userSelectedColumns' => ['except' => null, 'as' => $this->dataTableFingerprint() . '-c'],
             ];
         }
 

src/Traits/WithColumnSelect.php

@@ -36,8 +36,8 @@ public function setupColumnSelect(): void
             ->toArray();
 
         // Set to either the default set or what is stored in the session
-        $this->selectedColumns = count($this->userSelectedColumns) > 0 ?
-            $this->userSelectedColumns :
+        $this->selectedColumns = (isset($this->{$this->tableName}['columns']) && count($this->{$this->tableName}['columns']) > 0) ?
+            $this->{$this->tableName}['columns'] :
             session()->get($this->getColumnSelectSessionKey(), $columns);
 
         // Check to see if there are any excluded that are already stored in the enabled and remove them
@@ -51,7 +51,7 @@ public function setupColumnSelect(): void
 
     public function updatedSelectedColumns(): void
     {
-        $this->userSelectedColumns = $this->selectedColumns;
-        session([$this->getColumnSelectSessionKey() => $this->userSelectedColumns]);
+        $this->{$this->tableName}['columns'] = $this->selectedColumns;
+        session([$this->getColumnSelectSessionKey() => $this->{$this->tableName}['columns']]);
     }
 }