Move all QueryString Filter Code to HasQueryStringForFilter

Author: lrljoe

src/Traits/Core/QueryStrings/HasQueryStringForFilter.php

@@ -11,9 +11,16 @@ trait HasQueryStringForFilter
 
     protected ?string $queryStringAliasForFilter;
 
-    public function hasQueryStringStatusForFilter(): bool
+    protected function queryStringHasQueryStringForFilter(): array
     {
-        return isset($this->queryStringStatusForFilter);
+        if ($this->queryStringForFilterIsEnabled()) {
+            return [
+                'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
+                'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
+            ];
+        }
+
+        return [];
     }
 
     public function setupQueryStringStatusForFilter(): void
@@ -23,6 +30,11 @@ public function setupQueryStringStatusForFilter(): void
         }
     }
 
+    public function hasQueryStringStatusForFilter(): bool
+    {
+        return isset($this->queryStringStatusForFilter);
+    }
+
     public function getQueryStringStatusForFilter(): bool
     {
         return $this->queryStringStatusForFilter ?? true;
@@ -32,7 +44,7 @@ public function queryStringForFilterIsEnabled(): bool
     {
         $this->setupQueryStringStatusForFilter();
 
-        return $this->queryStringIsEnabled() === true && $this->getQueryStringStatusForFilter() === true && $this->filtersAreEnabled();
+        return (($this->queryStringIsEnabled() === true || $this->getQueryStringStatusForFilter() === true) && $this->filtersAreEnabled());
     }
 
     public function setQueryStringStatusForFilter(bool $status): self
@@ -66,9 +78,9 @@ public function getQueryStringAliasForFilter(): string
         return $this->queryStringAliasForFilter ?? $this->getQueryStringAlias().'-filters';
     }
 
-    public function setQueryStringAliasForFilter(string $queryStringAliasForFilter): self
+    public function setQueryStringAliasForFilter(string $alias): self
     {
-        $this->queryStringAliasForFilter = $queryStringAliasForFilter;
+        $this->queryStringAliasForFilter = $alias;
 
         return $this;
     }

src/Traits/WithFilters.php

@@ -49,18 +49,6 @@ public function filters(): array
         return [];
     }
 
-    protected function queryStringWithFilters(): array
-    {
-        if ($this->queryStringForFilterIsEnabled()) {
-            return [
-                'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
-                'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
-            ];
-        }
-
-        return [];
-    }
-
     public function applyFilters(): Builder
     {
         if ($this->filtersAreEnabled() && $this->hasFilters() && $this->hasAppliedFiltersWithValues()) {