Extract session key

Author: rappasoft

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
-## [1.11.0] - 2021-06-23
+## [1.10.4] - 2021-06-23
 
 ### Added
 
@@ -414,7 +414,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.3...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.4...development
+[1.10.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.3...v1.10.4
 [1.10.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.2...v1.10.3
 [1.10.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.1...v1.10.2
 [1.10.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.0...v1.10.1

src/Traits/WithColumnSelect.php

@@ -15,8 +15,8 @@ trait WithColumnSelect
     public function mountWithColumnSelect(): void
     {
         // If the column select is off, make sure to clear the session
-        if (! $this->columnSelect && session()->has($this->tableName.'-columnSelectEnabled')) {
-            session()->forget($this->tableName.'-columnSelectEnabled');
+        if (! $this->columnSelect && session()->has($this->getColumnSelectSessionKey())) {
+            session()->forget($this->getColumnSelectSessionKey());
         }
 
         // Get a list of visible default columns that are not excluded
@@ -27,24 +27,29 @@ public function mountWithColumnSelect(): void
             ->toArray();
 
         // Set to either the default set or what is stored in the session
-        $this->columnSelectEnabled = session()->get($this->tableName.'-columnSelectEnabled', $columns);
+        $this->columnSelectEnabled = 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->columns() as $column) {
             if (! $column->isSelectable() && ! in_array($column->column(), $this->columnSelectEnabled, true)) {
                 $this->columnSelectEnabled[] = $column->column();
-                session([$this->tableName.'-columnSelectEnabled' => $this->columnSelectEnabled]);
+                session([$this->getColumnSelectSessionKey() => $this->columnSelectEnabled]);
             }
         }
     }
 
     public function updatedColumnSelectEnabled(): void
     {
-        session([$this->tableName.'-columnSelectEnabled' => $this->columnSelectEnabled]);
+        session([$this->getColumnSelectSessionKey() => $this->columnSelectEnabled]);
     }
 
     public function isColumnSelectEnabled($column): bool
     {
         return in_array($column instanceof Column ? $column->column() : $column, $this->columnSelectEnabled, true);
     }
+
+    private function getColumnSelectSessionKey(): string
+    {
+        return $this->tableName.'-columnSelectEnabled';
+    }
 }

src/Traits/WithPerPagePagination.php

@@ -27,9 +27,6 @@ public function mountWithPerPagePagination(): void
         }
     }
 
-    /**
-     * @param $value
-     */
     public function updatedPerPage($value): void
     {
         if (in_array(session()->get($this->getPerPagePaginationSessionKey(), $this->perPage), $this->perPageAccepted, true)) {
@@ -41,10 +38,6 @@ public function updatedPerPage($value): void
         $this->resetPage();
     }
 
-    /**
-     * @param $query
-     * @return mixed
-     */
     public function applyPagination($query)
     {
         return $query->paginate($this->perPage === -1 ? $query->count() : $this->perPage, ['*'], $this->pageName());