From 8163e5fcfa39dec01e2c55897252a478e82a7781 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Sun, 24 Mar 2024 08:08:09 +0000 Subject: [PATCH] Move ComponentContainer --- .github/workflows/monorepo-split.yml | 1 + composer.json | 1 + .../actions/src/Concerns/CanBeMounted.php | 2 +- packages/forms/src/Components/Builder.php | 2 +- .../Concerns/BelongsToContainer.php | 2 +- .../Components/Concerns/CanBeCollapsed.php | 2 +- ...EntanglesStateWithSingularRelationship.php | 2 +- .../Concerns/HasChildComponents.php | 2 +- packages/forms/src/Components/Repeater.php | 2 +- packages/forms/src/Components/Select.php | 2 +- packages/forms/src/Concerns/HasColumns.php | 2 +- .../src/Concerns/HasFormComponentActions.php | 2 +- packages/forms/src/Form.php | 2 ++ packages/forms/src/Testing/TestsForms.php | 2 +- packages/infolists/composer.json | 1 + .../panels/src/Resources/Pages/EditRecord.php | 2 +- .../views/component-container.blade.php | 34 +++++++++---------- .../src/ComponentContainer.php | 5 +-- .../src/Testing/TestsComponentActions.php | 2 +- .../src/Pages/SettingsPage.php | 2 +- .../src/Filters/Concerns/HasFormSchema.php | 2 +- packages/tables/src/Filters/QueryBuilder.php | 2 +- .../Forms/Components/RuleBuilder.php | 2 +- packages/upgrade/src/rector.php | 8 +++++ tests/src/Actions/Fixtures/Pages/Actions.php | 2 +- tests/src/Forms/ComponentContainerTest.php | 2 +- tests/src/Forms/ComponentTest.php | 2 +- tests/src/Forms/EventsTest.php | 2 +- tests/src/Forms/FieldTest.php | 2 +- tests/src/Forms/GridTest.php | 2 +- tests/src/Forms/HiddenComponentsTest.php | 2 +- tests/src/Forms/ModelTest.php | 2 +- tests/src/Forms/RelationshipsTest.php | 2 +- tests/src/Forms/StateBindingModifiersTest.php | 2 +- tests/src/Forms/StateTest.php | 2 +- tests/src/Forms/ValidationTest.php | 2 +- tests/src/Tables/Fixtures/PostsTable.php | 2 +- 37 files changed, 63 insertions(+), 49 deletions(-) rename packages/{forms => schema}/resources/views/component-container.blade.php (72%) rename packages/{forms => schema}/src/ComponentContainer.php (95%) diff --git a/.github/workflows/monorepo-split.yml b/.github/workflows/monorepo-split.yml index 5655a40c21..26f06921dd 100644 --- a/.github/workflows/monorepo-split.yml +++ b/.github/workflows/monorepo-split.yml @@ -16,6 +16,7 @@ jobs: - infolists - notifications - panels + - schema - spark-billing-provider - spatie-laravel-google-fonts-plugin - spatie-laravel-media-library-plugin diff --git a/composer.json b/composer.json index 63f431d362..2c34210c0c 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,7 @@ "require-dev": { "anourvalar/eloquent-serialize": "^1.2", "danharrin/livewire-rate-limiting": "^0.3|^1.0", + "filament/schema": "*", "filament/support": "*", "kirschbaum-development/eloquent-power-joins": "^3.0", "larastan/larastan": "^2.2", diff --git a/packages/actions/src/Concerns/CanBeMounted.php b/packages/actions/src/Concerns/CanBeMounted.php index b937bc798e..0d6e69372f 100644 --- a/packages/actions/src/Concerns/CanBeMounted.php +++ b/packages/actions/src/Concerns/CanBeMounted.php @@ -3,7 +3,7 @@ namespace Filament\Actions\Concerns; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Form; trait CanBeMounted diff --git a/packages/forms/src/Components/Builder.php b/packages/forms/src/Components/Builder.php index 50222d038c..44a68451b7 100644 --- a/packages/forms/src/Components/Builder.php +++ b/packages/forms/src/Components/Builder.php @@ -3,7 +3,7 @@ namespace Filament\Forms\Components; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\Builder\Block; use Filament\Support\Concerns\HasReorderAnimationDuration; diff --git a/packages/forms/src/Components/Concerns/BelongsToContainer.php b/packages/forms/src/Components/Concerns/BelongsToContainer.php index 47d612eaa5..d723c1762a 100644 --- a/packages/forms/src/Components/Concerns/BelongsToContainer.php +++ b/packages/forms/src/Components/Concerns/BelongsToContainer.php @@ -2,7 +2,7 @@ namespace Filament\Forms\Components\Concerns; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Contracts\HasForms; trait BelongsToContainer diff --git a/packages/forms/src/Components/Concerns/CanBeCollapsed.php b/packages/forms/src/Components/Concerns/CanBeCollapsed.php index 55ada2f603..899a318b44 100644 --- a/packages/forms/src/Components/Concerns/CanBeCollapsed.php +++ b/packages/forms/src/Components/Concerns/CanBeCollapsed.php @@ -3,7 +3,7 @@ namespace Filament\Forms\Components\Concerns; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; trait CanBeCollapsed { diff --git a/packages/forms/src/Components/Concerns/EntanglesStateWithSingularRelationship.php b/packages/forms/src/Components/Concerns/EntanglesStateWithSingularRelationship.php index 9b9f71d664..774a17e051 100644 --- a/packages/forms/src/Components/Concerns/EntanglesStateWithSingularRelationship.php +++ b/packages/forms/src/Components/Concerns/EntanglesStateWithSingularRelationship.php @@ -3,7 +3,7 @@ namespace Filament\Forms\Components\Concerns; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Component; use Filament\Forms\Components\Contracts\CanEntangleWithSingularRelationships; use Filament\Forms\Contracts\HasForms; diff --git a/packages/forms/src/Components/Concerns/HasChildComponents.php b/packages/forms/src/Components/Concerns/HasChildComponents.php index 3cfe3aecbd..5a94e48848 100644 --- a/packages/forms/src/Components/Concerns/HasChildComponents.php +++ b/packages/forms/src/Components/Concerns/HasChildComponents.php @@ -3,7 +3,7 @@ namespace Filament\Forms\Components\Concerns; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Component; trait HasChildComponents diff --git a/packages/forms/src/Components/Repeater.php b/packages/forms/src/Components/Repeater.php index 7bd52fe910..2f020573b6 100644 --- a/packages/forms/src/Components/Repeater.php +++ b/packages/forms/src/Components/Repeater.php @@ -3,7 +3,7 @@ namespace Filament\Forms\Components; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Contracts\HasForms; use Filament\Support\Concerns\HasReorderAnimationDuration; diff --git a/packages/forms/src/Components/Select.php b/packages/forms/src/Components/Select.php index cd47cc0396..dfe62b829b 100644 --- a/packages/forms/src/Components/Select.php +++ b/packages/forms/src/Components/Select.php @@ -4,7 +4,7 @@ namespace Filament\Forms\Components; use Closure; use Exception; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Form; use Filament\Support\Concerns\HasExtraAlpineAttributes; diff --git a/packages/forms/src/Concerns/HasColumns.php b/packages/forms/src/Concerns/HasColumns.php index d51053297d..452ff4ede2 100644 --- a/packages/forms/src/Concerns/HasColumns.php +++ b/packages/forms/src/Concerns/HasColumns.php @@ -2,7 +2,7 @@ namespace Filament\Forms\Concerns; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; trait HasColumns { diff --git a/packages/forms/src/Concerns/HasFormComponentActions.php b/packages/forms/src/Concerns/HasFormComponentActions.php index 4aa7e0d105..c21b9b004e 100644 --- a/packages/forms/src/Concerns/HasFormComponentActions.php +++ b/packages/forms/src/Concerns/HasFormComponentActions.php @@ -2,7 +2,7 @@ namespace Filament\Forms\Concerns; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\Component; use Filament\Forms\Form; diff --git a/packages/forms/src/Form.php b/packages/forms/src/Form.php index 7d7ca11e5e..cd2ced7a9a 100644 --- a/packages/forms/src/Form.php +++ b/packages/forms/src/Form.php @@ -2,6 +2,8 @@ namespace Filament\Forms; +use Filament\ComponentContainer; + class Form extends ComponentContainer { } diff --git a/packages/forms/src/Testing/TestsForms.php b/packages/forms/src/Testing/TestsForms.php index 78d66ba3d8..5b85b6cf9d 100644 --- a/packages/forms/src/Testing/TestsForms.php +++ b/packages/forms/src/Testing/TestsForms.php @@ -3,7 +3,7 @@ namespace Filament\Forms\Testing; use Closure; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Field; use Filament\Forms\Components\TextInput; use Filament\Forms\Contracts\HasForms; diff --git a/packages/infolists/composer.json b/packages/infolists/composer.json index 96ae289a56..8cb3d515c4 100644 --- a/packages/infolists/composer.json +++ b/packages/infolists/composer.json @@ -10,6 +10,7 @@ "require": { "php": "^8.1", "filament/actions": "self.version", + "filament/schema": "*", "filament/support": "self.version", "illuminate/console": "^10.45|^11.0", "illuminate/contracts": "^10.45|^11.0", diff --git a/packages/panels/src/Resources/Pages/EditRecord.php b/packages/panels/src/Resources/Pages/EditRecord.php index 1c219cccc2..292d088070 100644 --- a/packages/panels/src/Resources/Pages/EditRecord.php +++ b/packages/panels/src/Resources/Pages/EditRecord.php @@ -9,7 +9,7 @@ use Filament\Actions\ForceDeleteAction; use Filament\Actions\ReplicateAction; use Filament\Actions\RestoreAction; use Filament\Actions\ViewAction; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\Component; use Filament\Forms\Form; use Filament\Infolists\Infolist; diff --git a/packages/forms/resources/views/component-container.blade.php b/packages/schema/resources/views/component-container.blade.php similarity index 72% rename from packages/forms/resources/views/component-container.blade.php rename to packages/schema/resources/views/component-container.blade.php index 1b41656b42..a4cb6b0a04 100644 --- a/packages/forms/resources/views/component-container.blade.php +++ b/packages/schema/resources/views/component-container.blade.php @@ -49,7 +49,7 @@ ->class(['fi-fo-component-ctn gap-6']) " > - @foreach ($getComponents(withHidden: true) as $formComponent) + @foreach ($getComponents(withHidden: true) as $schemaComponent) @php /** * Instead of only rendering the hidden components, we should @@ -61,26 +61,26 @@ * components need to have `class="hidden"`, so that they * don't consume grid space. */ - $isHidden = $formComponent->isHidden(); + $isHidden = $schemaComponent->isHidden(); @endphp getMaxWidth()) { + match ($maxWidth = $schemaComponent->getMaxWidth()) { MaxWidth::ExtraSmall, 'xs' => 'max-w-xs', MaxWidth::Small, 'sm' => 'max-w-sm', MaxWidth::Medium, 'md' => 'max-w-md', @@ -97,7 +97,7 @@ ]) > @if (! $isHidden) - {{ $formComponent }} + {{ $schemaComponent }} @endif @endforeach diff --git a/packages/forms/src/ComponentContainer.php b/packages/schema/src/ComponentContainer.php similarity index 95% rename from packages/forms/src/ComponentContainer.php rename to packages/schema/src/ComponentContainer.php index c050773945..99b517369e 100644 --- a/packages/forms/src/ComponentContainer.php +++ b/packages/schema/src/ComponentContainer.php @@ -1,7 +1,8 @@ rules([ @@ -21,4 +22,11 @@ return static function (RectorConfig $rectorConfig): void { 'Filament\\Forms\\Testing\\TestsComponentActions' => 'Filament\\Testing\\TestsComponentActions', ], ); + + $rectorConfig->ruleWithConfiguration( + RenameStringRector::class, + [ + 'filament-forms::component-container' => 'filament::component-container', + ], + ); }; diff --git a/tests/src/Actions/Fixtures/Pages/Actions.php b/tests/src/Actions/Fixtures/Pages/Actions.php index a8a8b3a24d..7a61d4347e 100644 --- a/tests/src/Actions/Fixtures/Pages/Actions.php +++ b/tests/src/Actions/Fixtures/Pages/Actions.php @@ -3,7 +3,7 @@ namespace Filament\Tests\Actions\Fixtures\Pages; use Filament\Actions\Action; -use Filament\Forms\ComponentContainer; +use Filament\ComponentContainer; use Filament\Forms\Components\TextInput; use Filament\Notifications\Notification; use Filament\Pages\Page; diff --git a/tests/src/Forms/ComponentContainerTest.php b/tests/src/Forms/ComponentContainerTest.php index 2238da8c90..f059febc7a 100644 --- a/tests/src/Forms/ComponentContainerTest.php +++ b/tests/src/Forms/ComponentContainerTest.php @@ -1,6 +1,6 @@