Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Livewire/ConsentOptionFormBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace Visualbuilder\FilamentUserConsent\Livewire;

use Filament\Forms;
use Filament\Forms\Components\Section;
use Filament\Schemas\Components\Section;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Notifications\Notification;
use Filament\Pages\Concerns\InteractsWithFormActions;
use Filament\Pages\SimplePage;
Expand Down Expand Up @@ -86,10 +86,10 @@ public function setDefaultValues()
$this->form->fill($fillData);
}

public function form(Form $form): Form
public function form(Schema $schema): Schema
{
return $form
->schema($this->getFormSchema())
return $schema
->components($this->getFormSchema())
->model($this->getFormModel())
->statePath('data')
->operation($this->getFormContext());
Expand Down
10 changes: 5 additions & 5 deletions src/Livewire/ConsentOptionPreview.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\Placeholder;
use Filament\Forms\Components\Radio;
use Filament\Forms\Components\Section;
use Filament\Schemas\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Visualbuilder\FilamentUserConsent\Models\ConsentOption;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Contracts\HasForms;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Utilities\Get;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\HtmlString;
use Livewire\Component;
Expand Down Expand Up @@ -58,10 +58,10 @@ public function setDefaultValues()
$this->form->fill($fillData);
}

public function form(Form $form)
public function form(Schema $schema): Schema
{
$formInputs = $this->getFormSchema();
return $form->schema($formInputs)
return $schema->components($formInputs)
->statePath('data');
}

Expand Down
24 changes: 12 additions & 12 deletions src/Resources/ConsentOptionResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace Visualbuilder\FilamentUserConsent\Resources;

use Filament\Forms\Components\Livewire;
use Filament\Schemas\Components\Livewire;
use Closure;
use Filament\Forms;
use Filament\Forms\Components\Group;
use Filament\Schemas\Components\Group;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Section;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Components\Utilities\Set;
use Filament\Pages\Enums\SubNavigationPosition;
use Filament\Resources\Resource;
use Filament\Tables;
Expand Down Expand Up @@ -66,12 +66,12 @@ public static function shouldRegisterNavigation(): bool
return config('filament-user-consent.navigation.consent_options.register');
}

public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
Section::make('')->schema([
Group::make()->schema([
return $schema
->components([
Section::make('')->components([
Group::make()->components([
Forms\Components\TextInput::make('title')
->live()
->afterStateUpdated(
Expand Down Expand Up @@ -142,7 +142,7 @@ public static function form(Form $form): Form
->columnSpanFull(),

])->columns(3),
Section::make('Additional Info')->schema([
Section::make('Additional Info')->components([

Repeater::make('fields')->label('')
->schema([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
use Closure;
use Filament\Forms;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Section;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Tables;
use Filament\Tables\Table;
Expand All @@ -20,11 +20,11 @@ class ConsentOptionQuestionsRelationManager extends RelationManager
{
protected static string $relationship = 'questions';

public function form(Form $form): Form
public function form(Schema $schema): Schema
{
return $form
->schema([
Section::make()->schema([
return $schema
->components([
Section::make()->components([
Forms\Components\Select::make('component')
->required()
->options(config('filament-user-consent.components'))
Expand Down Expand Up @@ -56,7 +56,7 @@ public function form(Form $form): Form
->inline(false)
->visible(fn(Get $get) => $get('component') !== 'placeholder'),
])->columns(3),
Section::make()->schema([
Section::make()->components([
Repeater::make('options')
->relationship()
->schema([
Expand All @@ -81,7 +81,7 @@ public function form(Form $form): Form
->orderColumn('sort')
->columns(2)
])->visible(fn (Get $get) => in_array($get('component'), ['likert', 'select', 'radio', 'check'])),
Section::make()->schema([
Section::make()->components([
TinyEditor::make('content')
->label("HTML Content")
->profile('default')
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/ConsentOptionResponseResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Visualbuilder\FilamentUserConsent\Resources;

use Filament\Forms\Form;
use Filament\Schemas\Schema;
use Filament\Infolists\Components\Grid as ComponentsGrid;
use Filament\Infolists\Components\RepeatableEntry;
use Filament\Infolists\Components\Section;
Expand Down Expand Up @@ -57,10 +57,10 @@ public static function shouldRegisterNavigation(): bool
return config('filament-user-consent.navigation.consent_responses.register');
}

public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([

]);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
use Filament\Actions\ActionsServiceProvider;
use Filament\FilamentServiceProvider;
use Filament\Forms\FormsServiceProvider;
use Filament\Schemas\SchemasServiceProvider;
use Filament\Infolists\InfolistsServiceProvider;
use Filament\Notifications\NotificationsServiceProvider;
use Filament\SpatieLaravelSettingsPluginServiceProvider;
use Filament\SpatieLaravelTranslatablePluginServiceProvider;
use Filament\Support\SupportServiceProvider;
use Filament\Tables\TablesServiceProvider;
use Filament\Widgets\WidgetsServiceProvider;
Expand Down Expand Up @@ -50,11 +50,11 @@ protected function getPackageProviders($app)
BladeIconsServiceProvider::class,
FilamentServiceProvider::class,
FormsServiceProvider::class,
SchemasServiceProvider::class,
InfolistsServiceProvider::class,
LivewireServiceProvider::class,
NotificationsServiceProvider::class,
SpatieLaravelSettingsPluginServiceProvider::class,
SpatieLaravelTranslatablePluginServiceProvider::class,
SupportServiceProvider::class,
TablesServiceProvider::class,
WidgetsServiceProvider::class,
Expand Down
Loading