implement feature

Author: =

resources/views/components/tools/toolbar.blade.php

@@ -260,7 +260,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                                                         wire:target="selectedColumns"
                                                         wire:loading.attr="disabled"
                                                         type="checkbox"
-                                                        value="{{ $column->getHash() }}"
+                                                        value="{{ $column->getField() }}"
                                                     />
                                                     <span class="ml-2">{{ $column->getTitle() }}</span>
                                                 </label>
@@ -511,7 +511,7 @@ class="px-2 {{ $loop->last ? 'mb-0' : 'mb-1' }}"
                                                 wire:target="selectedColumns"
                                                 wire:loading.attr="disabled"
                                                 type="checkbox"
-                                                value="{{ $column->getHash() }}"
+                                                value="{{ $column->getField() }}"
                                             />
                                             <span class="ml-2">{{ $column->getTitle() }}</span>
                                         </label>
@@ -754,7 +754,7 @@ class="px-2 {{ $loop->last ? 'mb-0' : 'mb-1' }}"
                                                 wire:target="selectedColumns"
                                                 wire:loading.attr="disabled"
                                                 type="checkbox"
-                                                value="{{ $column->getHash() }}"
+                                                value="{{ $column->getField() }}"
                                             />
                                             <span class="ml-2">{{ $column->getTitle() }}</span>
                                         </label>

src/DataTableComponent.php

@@ -47,6 +47,17 @@ abstract class DataTableComponent extends Component
         'clearFilters' => 'clearFilterEvent',
     ];
 
+    /**
+     * returns a unique id for the table, used as an alias to identify one table from another session and query string to prevent conflicts
+     */
+    public function dataTableFingerprint(): string
+    {
+        $className = str_split(static::class);
+        $crc32 = sprintf('%u', crc32(serialize($className)));
+
+        return base_convert($crc32, 10, 36);
+    }
+
     /**
      * Runs on every request, immediately after the component is instantiated, but before any other lifecycle methods are called
      */

src/Traits/ComponentUtilities.php

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

src/Traits/Helpers/ColumnSelectHelpers.php

@@ -65,7 +65,7 @@ public function rememberColumnSelectionIsDisabled(): bool
      */
     public function columnSelectIsEnabledForColumn($column): bool
     {
-        return in_array($column instanceof Column ? $column->getHash() : $column, $this->selectedColumns, true);
+        return in_array($column instanceof Column ? $column->getField() : $column, $this->selectedColumns, true);
     }
 
     /**
@@ -82,6 +82,6 @@ protected function forgetColumnSelectSession()
      */
     protected function getColumnSelectSessionKey()
     {
-        return $this->getTableName().'-columnSelectEnabled';
+        return $this->dataTableFingerprint().'-columnSelectEnabled';
     }
 }

src/Traits/WithColumnSelect.php

@@ -31,24 +31,27 @@ public function setupColumnSelect(): void
             ->filter(function ($column) {
                 return $column->isVisible() && $column->isSelectable() && $column->isSelected();
             })
-            ->map(fn ($column) => $column->getHash())
+            ->map(fn ($column) => $column->getField())
             ->values()
             ->toArray();
 
         // Set to either the default set or what is stored in the session
-        $this->selectedColumns = session()->get($this->getColumnSelectSessionKey(), $columns);
+        $this->selectedColumns = count($this->userSelectedColumns) > 0 ?
+            $this->userSelectedColumns :
+            session()->get($this->getColumnSelectSessionKey(), $columns);
 
         // Check to see if there are any excluded that are already stored in the enabled and remove them
         foreach ($this->getColumns() as $column) {
-            if (! $column->isSelectable() && ! in_array($column->getHash(), $this->selectedColumns, true)) {
-                $this->selectedColumns[] = $column->getHash();
+            if (! $column->isSelectable() && ! in_array($column->getField(), $this->selectedColumns, true)) {
+                $this->selectedColumns[] = $column->getField();
                 session([$this->getColumnSelectSessionKey() => $this->selectedColumns]);
             }
         }
     }
 
     public function updatedSelectedColumns(): void
     {
-        session([$this->getColumnSelectSessionKey() => $this->selectedColumns]);
+        $this->userSelectedColumns = $this->selectedColumns;
+        session([$this->getColumnSelectSessionKey() => $this->userSelectedColumns]);
     }
 }

src/Views/Traits/Helpers/ColumnHelpers.php

@@ -20,16 +20,6 @@ public function getComponent(): ?DataTableComponent
         return $this->component;
     }
 
-    /**
-     * @param  DataTableComponent  $component
-     *
-     * @return $this
-     */
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
     /**
      * @return bool
      */

tests/Views/Traits/Helpers/ColumnHelpersTest.php

@@ -320,14 +320,6 @@ public function can_get_column_formatter(): void
         $this->assertInstanceOf(Closure::class, $column->getFormatCallback());
     }
 
-    /** @test */
-    public function can_get_column_hash(): void
-    {
-        $column = Column::make('Name');
-
-        $this->assertSame($column->getHash(), md5('name'));
-    }
-
     /** @test */
     public function can_check_if_column_has_secondary_header(): void
     {