Search Relation and where condition on query builder

[TengkuFirmansyah]

Livewire PowerGrid version

v6.6

Livewire version

v3.6

Laravel version

v12.0

Which PHP version are you using?

PHP 8.2

Which Theme are you using?

Bootstrap 5

Have you published the resource files and customized them? (php artisan vendor:publish)

Yes

What is the problem?

jika query builder saya memiliki kondisi where seperti "status = 1" dan memiliki relationsearch, maka ketika pencarian data itu "status = 1" itu tidak berfungsi, alias tertimpa oleh query orwhere nya relationsearch itu sendiri

Code snippets

On Table :

public function datasource(): Builder
{
    return District::query()->where('status', 1)->with('City');
}

public function relationSearch(): array
{
    return [
        'City' => [
            'name'
        ]
    ];
}

On SearchHandler.php :

public function apply(EloquentBuilder|QueryBuilder $query): EloquentBuilder|QueryBuilder
{
    if ($this->component->search == '') {
        return $query;
    }

    $search = trim(strtolower(htmlspecialchars($this->component->search, ENT_QUOTES | ENT_HTML5, 'UTF-8')));
    $hasRelationSearch = count($this->component->relationSearch()) && $query instanceof EloquentBuilder;

    $query->where(function (EloquentBuilder|QueryBuilder $subQuery) use ($search, $hasRelationSearch) {
        $modelTable = $subQuery instanceof QueryBuilder ? $subQuery->from : $subQuery->getModel()->getTable();
        $columnList = $this->getColumnList($subQuery, $modelTable);

        collect($this->component->columns)
            ->filter(fn (stdClass|array|Column $column) => (bool) data_get($column, 'searchable'))
            ->each(function (stdClass|array|Column $column) use ($subQuery, $search, $columnList, $hasRelationSearch) {
                $field = $this->getDataField($column);
                [$table, $field] = $this->splitField($subQuery, $field);
                $search = $this->getBeforeSearchMethod($field, $search);

                if (empty($table)) {
                    $subQuery->orWhere($field, Sql::like($subQuery), "%{$search}%");

                    return;
                }

                if (isset($columnList[$field]) || ! $hasRelationSearch) {
                    $subQuery->orWhere("{$table}.{$field}", Sql::like($subQuery), "%{$search}%");
                }
            });
            
            if ($hasRelationSearch) {
                $this->filterRelation($subQuery, $search);
            }
        });

    return $query;
}

How do you expect it to work?

I just changed this data :

            if ($hasRelationSearch) {
                $this->filterRelation($query, $search);
            }

To :

            if ($hasRelationSearch) {
                $this->filterRelation($subQuery, $search);
            }

Please confirm (incomplete submissions will not be addressed)

• I have provided easy and step-by-step instructions to reproduce the bug.
• I have provided code samples as text and NOT images.
• I understand my bug report will be removed if I haven't met the criteria above.