diff --git a/packages/infolists/src/Commands/FileGenerators/Concerns/CanGenerateModelInfolists.php b/packages/infolists/src/Commands/FileGenerators/Concerns/CanGenerateModelInfolists.php index bfc5c68be4..41cffc0e55 100644 --- a/packages/infolists/src/Commands/FileGenerators/Concerns/CanGenerateModelInfolists.php +++ b/packages/infolists/src/Commands/FileGenerators/Concerns/CanGenerateModelInfolists.php @@ -88,6 +88,8 @@ trait CanGenerateModelInfolists $componentName = "{$guessedRelationshipName}.{$guessedRelationshipTitleColumnName}"; } + } else { + $guessedRelationshipName = null; } $componentData = []; @@ -134,7 +136,7 @@ trait CanGenerateModelInfolists 'float', 'double', 'money', - ]) && blank($guessedRelationshipName ?? null)) { + ]) && blank($guessedRelationshipName)) { $componentData[in_array($componentName, [ 'cost', 'money', diff --git a/packages/tables/src/Commands/FileGenerators/Concerns/CanGenerateModelTables.php b/packages/tables/src/Commands/FileGenerators/Concerns/CanGenerateModelTables.php index 7d3b0638a9..87ee5902b1 100644 --- a/packages/tables/src/Commands/FileGenerators/Concerns/CanGenerateModelTables.php +++ b/packages/tables/src/Commands/FileGenerators/Concerns/CanGenerateModelTables.php @@ -107,6 +107,8 @@ trait CanGenerateModelTables $columnName = "{$guessedRelationshipName}.{$guessedRelationshipTitleColumnName}"; } + } else { + $guessedRelationshipName = null; } $columnData = []; @@ -132,10 +134,10 @@ trait CanGenerateModelTables default => TextColumn::class, }; - if (in_array($type['name'], [ + if ((in_array($type['name'], [ 'string', 'char', - ]) && ($columnData['type'] === TextColumn::class)) { + ]) && ($columnData['type'] === TextColumn::class)) || filled($guessedRelationshipName)) { $columnData['searchable'] = []; } @@ -163,7 +165,7 @@ trait CanGenerateModelTables 'float', 'double', 'money', - ]) && blank($guessedRelationshipName ?? null)) { + ]) && blank($guessedRelationshipName)) { $columnData[in_array($columnName, [ 'cost', 'money', diff --git a/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_the_form_and_table_of_a_resource_class.snap b/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_the_form_and_table_of_a_resource_class.snap index 8a6d4b286b..123e412aa8 100644 --- a/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_the_form_and_table_of_a_resource_class.snap +++ b/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_the_form_and_table_of_a_resource_class.snap @@ -53,8 +53,7 @@ class PostResource extends Resource return $table ->columns([ Tables\Columns\TextColumn::make('author.name') - ->numeric() - ->sortable(), + ->searchable(), Tables\Columns\IconColumn::make('is_published') ->boolean(), Tables\Columns\TextColumn::make('rating') diff --git a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_form__infolist__and_table_content_embedded_in_a_resource_class.snap b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_form__infolist__and_table_content_embedded_in_a_resource_class.snap index bf9c9c92cd..72434f94dd 100644 --- a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_form__infolist__and_table_content_embedded_in_a_resource_class.snap +++ b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_form__infolist__and_table_content_embedded_in_a_resource_class.snap @@ -64,8 +64,7 @@ class PostResource extends Resource { return $schema ->components([ - TextEntry::make('author.name') - ->numeric(), + TextEntry::make('author.name'), IconEntry::make('is_published') ->boolean(), TextEntry::make('rating') @@ -86,8 +85,7 @@ class PostResource extends Resource return $table ->columns([ TextColumn::make('author.name') - ->numeric() - ->sortable(), + ->searchable(), IconColumn::make('is_published') ->boolean(), TextColumn::make('rating') diff --git a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_infolist_content.snap b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_infolist_content.snap index 2d3c871f59..08507c7cd8 100644 --- a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_infolist_content.snap +++ b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_infolist_content.snap @@ -12,8 +12,7 @@ class PostInfolist { return $schema ->components([ - TextEntry::make('author.name') - ->numeric(), + TextEntry::make('author.name'), IconEntry::make('is_published') ->boolean(), TextEntry::make('rating') diff --git a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_table_content.snap b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_table_content.snap index 267c6e2ee6..a973a3e1b0 100644 --- a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_table_content.snap +++ b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_the_resource_table_content.snap @@ -16,8 +16,7 @@ class PostsTable return $table ->columns([ TextColumn::make('author.name') - ->numeric() - ->sortable(), + ->searchable(), IconColumn::make('is_published') ->boolean(), TextColumn::make('rating') diff --git a/tests/.pest/snapshots/src/Tables/Commands/MakeLivewireTableCommandTest/it_can_generate_a_Livewire_table_component_with_generated_columns.snap b/tests/.pest/snapshots/src/Tables/Commands/MakeLivewireTableCommandTest/it_can_generate_a_Livewire_table_component_with_generated_columns.snap index 9d4a95ccdc..80600c7e00 100644 --- a/tests/.pest/snapshots/src/Tables/Commands/MakeLivewireTableCommandTest/it_can_generate_a_Livewire_table_component_with_generated_columns.snap +++ b/tests/.pest/snapshots/src/Tables/Commands/MakeLivewireTableCommandTest/it_can_generate_a_Livewire_table_component_with_generated_columns.snap @@ -29,8 +29,7 @@ class ListPostsWithColumns extends Component implements HasActions, HasSchemas, ->query(fn (): Builder => Post::query()) ->columns([ TextColumn::make('author.name') - ->numeric() - ->sortable(), + ->searchable(), IconColumn::make('is_published') ->boolean(), TextColumn::make('rating')