Attempt to describe filter forms and handle form filters

Author: dmason30

src/DescribeFilamentResourceTool.php

@@ -217,22 +217,22 @@ public function mapFilterType(BaseFilter $filter): string
         };
     }
 
-    public function mapFormComponent(Component $component, Resource $resource): ?array
+    public function mapFormComponent(Component $component, ?Resource $resource = null): ?array
     {
         $baseInfo = [
             'name' => $component->getName(),
             'type' => $this->mapComponentType($component),
             'label' => $component->getLabel(),
             'required' => method_exists($component, 'isRequired') ? $component->isRequired() : null,
-            'disabled' => method_exists($component, 'isDisabled') ? $component->isDisabled() : null,
+            // 'disabled' => method_exists($component, 'isDisabled') ? $component->isDisabled() : null, // Needs container to be instantiated
             // 'nullable' => method_exists($component, 'isNullable') ? $component->isNullable() : null, // Needs checking validation rules
         ];
 
         if ($component instanceof TextInput) {
             $baseInfo['maxLength'] = $component->getMaxLength();
         }
 
-        if ($component instanceof Select && $component->getRelationshipName()) {
+        if ($resource && $component instanceof Select && $component->getRelationshipName()) {
             $modelClass = $resource::getModel();
             $modelInstance = app($modelClass);
             $relationshipDefinition = $modelInstance->{$component->getRelationshipName()}();
@@ -293,6 +293,21 @@ public function mapTableFilter(BaseFilter $filter): array
                 $baseInfo['optionsSource'] = $options;
             }
         }
+
+        if ($filter->hasFormSchema()) {
+            /** @var Component $component */
+            $fields = collect($filter->getFormSchema())
+                ->reject(fn (Component $component) => $component instanceof Grid || $component instanceof Fieldset)
+                ->map(fn (Component $component) => $this->mapFormComponent($component))
+                ->filter()
+                ->values()
+                ->all();
+
+            if ($fields) {
+                $baseInfo['fields'] = $fields;
+            }
+        }
+
         // Add more specific filter type mappings here if needed
 
         return $baseInfo;

src/GetFilamentResourceDataTool.php

@@ -4,6 +4,8 @@
 
 use Exception;
 use Filament\Tables\Columns\Column;
+use Filament\Tables\Concerns\InteractsWithTable;
+use Filament\Tables\Filters\SelectFilter;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Log;
 use JsonException;
@@ -32,6 +34,8 @@ public function build(): PrismTool
                 try {
                     $listPageClass = $resource::getPages()['index'];
                     $component = $listPageClass->getPage();
+
+                    /** @var InteractsWithTable $listPage */
                     $listPage = new $component;
                     $listPage->bootedInteractsWithTable();
                     $table = $listPage->getTable();
@@ -44,17 +48,29 @@ public function build(): PrismTool
                             $listPage->tableSearch = $filters[$column->getName()];
                         });
 
+                    $listPage->resetTableFiltersForm();
+
                     foreach ($listPage->getTable()->getFilters() as $filter) {
-                        if (method_exists($filter, 'isMultiple') && $filter->isMultiple()) {
-                            $listPage->tableFilters[$filter->getName()] = [
-                                'values' => isset($filters[$filter->getName()])
-                                    ? (array) $filters[$filter->getName()]
-                                    : null,
-                            ];
+                        $value = $filters[$filter->getName()] ?? null;
+
+                        if (blank($value)) {
+                            continue;
+                        }
+
+                        if ($filter instanceof SelectFilter) {
+                            if (method_exists($filter, 'isMultiple') && $filter->isMultiple()) {
+                                $listPage->tableFilters[$filter->getName()] = [
+                                    'values' => isset($filters[$filter->getName()])
+                                        ? (array) $filters[$filter->getName()]
+                                        : null,
+                                ];
+                            } else {
+                                $listPage->tableFilters[$filter->getName()] = [
+                                    'value' => $filters[$filter->getName()] ?? null,
+                                ];
+                            }
                         } else {
-                            $listPage->tableFilters[$filter->getName()] = [
-                                'value' => $filters[$filter->getName()] ?? null,
-                            ];
+                            $listPage->tableFilters[$filter->getName()] = $value;
                         }
                     }