diff --git a/resources/views/components/tools/filters/date-range.blade.php b/resources/views/components/tools/filters/date-range.blade.php index 4d233b1e4..44f71fd76 100644 --- a/resources/views/components/tools/filters/date-range.blade.php +++ b/resources/views/components/tools/filters/date-range.blade.php @@ -15,7 +15,7 @@ x-ref="dateRangeInput" x-on:click="init" x-on:change="changedValue($refs.dateRangeInput.value)" - value="{{ $filter->getDateString(isset($this->appliedFilters[$filterKey]) ? $this->appliedFilters[$filterKey] : '') }}" + value="{{ $filter->getDateString(isset($this->filterComponents[$filterKey]) ? $this->filterComponents[$filterKey] : '') }}" wire:key="{{ $filter->generateWireKey($tableName, 'dateRange') }}" id="{{ $tableName }}-filter-dateRange-{{ $filterKey }}" @class([ diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php index 056500190..2f3523e65 100644 --- a/src/Traits/Helpers/FilterHelpers.php +++ b/src/Traits/Helpers/FilterHelpers.php @@ -21,14 +21,14 @@ public function mountFilterHelpers(): void $this->restoreFilterValues(); foreach ($this->getFilters() as $filter) { - if (! isset($this->appliedFilters[$filter->getKey()])) { + if (! isset($this->filterComponents[$filter->getKey()])) { if ($filter->hasFilterDefaultValue()) { $this->setFilter($filter->getKey(), $filter->getFilterDefaultValue()); } else { $this->resetFilter($filter); } } else { - $this->setFilter($filter->getKey(), $this->appliedFilters[$filter->getKey()]); + $this->setFilter($filter->getKey(), $this->filterComponents[$filter->getKey()]); } } } @@ -139,7 +139,7 @@ public function getFilterByKey(string $key) #[On('set-filter')] public function setFilter(string $filterKey, string|array|null $value): void { - $this->appliedFilters[$filterKey] = $this->filterComponents[$filterKey] = $value; + $this->filterComponents[$filterKey] = $value; $this->callHook('filterSet', ['filter' => $filterKey, 'value' => $value]); $this->callTraitHook('filterSet', ['filter' => $filterKey, 'value' => $value]); @@ -228,7 +228,7 @@ public function hasAppliedVisibleFiltersForPills(): bool */ public function getAppliedFiltersWithValues(): array { - return $this->appliedFilters = array_filter($this->getAppliedFilters(), function ($item, $key) { + return $this->filterComponents = array_filter($this->getAppliedFilters(), function ($item, $key) { return ! $this->getFilterByKey($key)->isEmpty($item) && (is_array($item) ? count($item) : $item !== null); }, ARRAY_FILTER_USE_BOTH); } diff --git a/src/Traits/Helpers/SessionStorageHelpers.php b/src/Traits/Helpers/SessionStorageHelpers.php index 67f4d5829..f38eea149 100644 --- a/src/Traits/Helpers/SessionStorageHelpers.php +++ b/src/Traits/Helpers/SessionStorageHelpers.php @@ -23,14 +23,14 @@ public function storeFilterValues(): void { if ($this->shouldStoreFiltersInSession()) { $this->clearStoredFilterValues(); - session([$this->getFilterSessionKey() => $this->appliedFilters]); + session([$this->getFilterSessionKey() => $this->filterComponents]); } } public function restoreFilterValues(): void { - if (empty($this->filterComponents) || empty($this->appliedFilters)) { - $this->filterComponents = $this->appliedFilters = $this->getStoredFilterValues(); + if (empty($this->filterComponents)) { + $this->filterComponents = $this->getStoredFilterValues(); } } diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php index 3c2ff58c5..c29fee256 100644 --- a/src/Traits/WithFilters.php +++ b/src/Traits/WithFilters.php @@ -35,9 +35,6 @@ trait WithFilters // Set in JS public array $filterComponents = []; - // Set in Frontend - public array $appliedFilters = []; - public array $filterGenericData = []; protected ?Collection $filterCollection; @@ -51,7 +48,6 @@ protected function queryStringWithFilters(): array { if ($this->queryStringIsEnabled() && $this->filtersAreEnabled()) { return [ - 'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'], 'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'], ]; }