POC

src/Concerns/Filter.php

@@ -330,16 +330,33 @@ public function addEnabledFilters(string $field, ?string $label): void
         }
     }
 
+    //@TODO REFACTOR
+    public function ____COLUMNS_FOR_QUERY_STRING()
+    {
+        collect($this->columns())
+                 ->each(function ($column) use (&$columns) {
+                     if (isset($column->dataField)) {
+                         $columns[$column->dataField] = $column->title;
+                     }
+
+                     $columns[$column->field] = $column->title;
+                 });
+
+        return collect($columns);
+
+    }
+
     protected function powerGridQueryString(): array
     {
         $queryString = [];
 
+        $columns = $this->____COLUMNS_FOR_QUERY_STRING();
+
         foreach (Arr::dot($this->filters()) as $filter) {
-            $as = str($filter->field)
-                ->replace('_id', '');
+            $as = str($filter->field)->replace('.', '_');
 
-            if ($as->contains('.')) {
-                $as = $as->afterLast('.');
+            if(!is_null(request()->get($as))) {
+                $this->addEnabledFilters($filter->field, $columns->get($filter->field), $filter->field);
             }
 
             if ($filter->key === 'input_text') {
@@ -357,16 +374,26 @@ protected function powerGridQueryString(): array
             }
 
             if ($filter->key === 'number') {
+                $_start = $as->append('_start')->toString();
+                $_end = $as->append('_end')->toString();
+
                 $queryString['filters.number.' . $filter->field . '.start'] = [
-                    'as'     => $as->append('_start')->toString(),
+                    'as'     => $_start,
                     'except' => '',
                 ];
 
+                if(!is_null(request()->get($_start))) {
+                    $this->addEnabledFilters($filter->field . '_start', $columns->get($filter->field), $filter->field);
+                }
+
                 $queryString['filters.number.' . $filter->field . '.end'] = [
-                    'as'     => $as->append('_end')->toString(),
+                    'as'     => $_end,
                     'except' => '',
                 ];
 
+                if(!is_null(request()->get($_end))) {
+                    $this->addEnabledFilters($filter->field  . '_end', $columns->get($filter->field), $filter->field);
+                }
                 continue;
             }