Adjust SessionStorage locations

Author: lrljoe

src/Traits/Configuration/SessionStorageConfiguration.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\SessionStorage;
+
+trait HasColumnSelectSessionStorage
+{
+    protected function storeColumnSelectInSessionStatus(bool $status): self
+    {
+        $this->setSessionStorageStatus('columnselect', $status);
+
+        return $this;
+    }
+
+    public function storeColumnSelectInSessionEnabled(): self
+    {
+        return $this->storeColumnSelectInSessionStatus(true);
+    }
+
+    public function storeColumnSelectInSessionDisabled(): self
+    {
+        return $this->storeColumnSelectInSessionStatus(false);
+    }
+
+    public function shouldStoreColumnSelectInSession(): bool
+    {
+        return $this->getSessionStorageStatus('columnselect');
+    }
+
+    public function getColumnSelectSessionKey(): string
+    {
+        return $this->getTableName().'-stored-columnselect';
+    }
+
+    public function storeColumnSelectValues(): void
+    {
+        if ($this->shouldStoreColumnSelectInSession()) {
+            $this->clearStoredColumnSelectValues();
+            session([$this->getColumnSelectSessionKey() => $this->selectedColumns]);
+        }
+    }
+
+    public function restoreColumnSelectValues(): void
+    {
+        $this->selectedColumns = $this->getStoredColumnSelectValues();
+    }
+
+    public function getStoredColumnSelectValues(): array
+    {
+        if ($this->shouldStoreColumnSelectInSession() && session()->has($this->getColumnSelectSessionKey())) {
+            return session()->get($this->getColumnSelectSessionKey());
+        }
+
+        return [];
+    }
+
+    public function clearStoredColumnSelectValues(): void
+    {
+        if ($this->shouldStoreColumnSelectInSession() && session()->has($this->getColumnSelectSessionKey())) {
+            session()->forget($this->getColumnSelectSessionKey());
+        }
+    }
+
+    protected function forgetColumnSelectSession(): void
+    {
+        session()->forget($this->getColumnSelectSessionKey());
+    }
+
+}

src/Traits/Core/SessionStorage/HasColumnSelectSessionStorage.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\SessionStorage;
+
+trait HasFilterSessionStorage
+{
+    protected function storeFiltersInSessionStatus(bool $status): self
+    {
+        $this->setSessionStorageStatus('filters', $status);
+
+        return $this;
+    }
+
+    public function storeFiltersInSessionEnabled(): self
+    {
+        return $this->storeFiltersInSessionStatus(true);
+    }
+
+    public function storeFiltersInSessionDisabled(): self
+    {
+        return $this->storeFiltersInSessionStatus(false);
+    }
+
+    public function shouldStoreFiltersInSession(): bool
+    {
+        return $this->getSessionStorageStatus('filters');
+    }
+
+    public function getFilterSessionKey(): string
+    {
+        return $this->getTableName().'-stored-filters';
+    }
+
+    public function storeFilterValues(): void
+    {
+        if ($this->shouldStoreFiltersInSession()) {
+            $this->clearStoredFilterValues();
+            session([$this->getFilterSessionKey() => $this->appliedFilters]);
+        }
+    }
+
+    public function restoreFilterValues(): void
+    {
+        if (empty($this->filterComponents) || empty($this->appliedFilters)) {
+            $this->filterComponents = $this->appliedFilters = $this->getStoredFilterValues();
+        }
+    }
+
+    public function getStoredFilterValues(): array
+    {
+        if ($this->shouldStoreFiltersInSession() && session()->has($this->getFilterSessionKey())) {
+            return session()->get($this->getFilterSessionKey());
+        }
+
+        return [];
+    }
+
+    public function clearStoredFilterValues(): void
+    {
+        if ($this->shouldStoreFiltersInSession() && session()->has($this->getFilterSessionKey())) {
+            session()->forget($this->getFilterSessionKey());
+        }
+    }
+}

src/Traits/Core/SessionStorage/HasFilterSessionStorage.php

@@ -2,16 +2,27 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
-use Rappasoft\LaravelLivewireTables\Traits\Configuration\SessionStorageConfiguration;
-use Rappasoft\LaravelLivewireTables\Traits\Helpers\SessionStorageHelpers;
+use Rappasoft\LaravelLivewireTables\Traits\Core\SessionStorage\{HasFilterSessionStorage,HasColumnSelectSessionStorage};
 
 trait WithSessionStorage
 {
-    use SessionStorageConfiguration,
-        SessionStorageHelpers;
+    use HasFilterSessionStorage,
+    HasColumnSelectSessionStorage;
 
     public array $sessionStorageStatus = [
         'columnselect' => true,
         'filters' => false,
     ];
+
+    protected function getSessionStorageStatus(string $name): bool
+    {
+        return $this->sessionStorageStatus[$name] ?? false;
+    }
+    
+    protected function setSessionStorageStatus(string $name, bool $status): self
+    {
+        $this->sessionStorageStatus[$name] = $status;
+
+        return $this;
+    }
 }