Skip to content

Commit 7888cfa

Browse files
BaspaBaspa
committed
Merge branch 'main' of github.com:vormkracht10/filament-fields
2 parents 2693bd8 + 4e40119 commit 7888cfa

File tree

5 files changed

+57
-54
lines changed

5 files changed

+57
-54
lines changed

‎config/filament-fields.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
'select' => [
1818
'resource_options' => [
1919
// App\Filament\Resources\ContentResource::class,
20-
]
21-
]
22-
];
20+
],
21+
],
22+
];

‎src/Concerns/HasFieldsMapper.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private function resolveFormFields(): array
106106
$customFields = $this->resolveCustomFields();
107107

108108
return $this->record->fields
109-
->map(fn($field) => $this->resolveFieldInput($field, $customFields))
109+
->map(fn ($field) => $this->resolveFieldInput($field, $customFields))
110110
->filter()
111111
->values()
112112
->all();
@@ -115,7 +115,7 @@ private function resolveFormFields(): array
115115
private function resolveCustomFields(): Collection
116116
{
117117
return collect(Fields::getFields())
118-
->map(fn($fieldClass) => new $fieldClass);
118+
->map(fn ($fieldClass) => new $fieldClass);
119119
}
120120

121121
private function resolveFieldInput(Model $field, Collection $customFields): ?object
@@ -134,4 +134,4 @@ private function resolveFieldInput(Model $field, Collection $customFields): ?obj
134134

135135
return null;
136136
}
137-
}
137+
}

‎src/Concerns/HasOptions.php‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace Vormkracht10\Fields\Concerns;
44

55
use Filament\Forms;
6-
use Illuminate\Support\Str;
7-
use Filament\Forms\Components\Grid;
8-
use Illuminate\Support\Facades\Schema;
96
use Filament\Forms\Components\Fieldset;
7+
use Filament\Forms\Components\Grid;
108
use Filament\Forms\Components\Repeater;
9+
use Illuminate\Support\Facades\Schema;
10+
use Illuminate\Support\Str;
1111

1212
trait HasOptions
1313
{
@@ -19,17 +19,18 @@ public static function addOptionsToInput(mixed $input, mixed $field): mixed
1919
foreach ($field->config['relations'] as $relation) {
2020
$resources = config('filament-fields.select.resource_options');
2121
$resourceClass = collect($resources)->first(function ($resource) use ($relation) {
22-
$res = new $resource();
22+
$res = new $resource;
2323
$model = $res->getModel();
24-
$model = new $model();
24+
$model = new $model;
25+
2526
return $model->getTable() === $relation['resource'];
2627
});
2728

28-
if (!$resourceClass) {
29+
if (! $resourceClass) {
2930
continue;
3031
}
3132

32-
$resource = new $resourceClass();
33+
$resource = new $resourceClass;
3334
$model = $resource->getModel();
3435
$query = $model::query();
3536

@@ -57,7 +58,7 @@ public static function addOptionsToInput(mixed $input, mixed $field): mixed
5758
$options[] = $opts;
5859
}
5960

60-
if (!empty($options)) {
61+
if (! empty($options)) {
6162
$options = array_merge(...$options);
6263
$input->options($options);
6364
}
@@ -104,8 +105,8 @@ public function optionFormFields(): Fieldset
104105
Forms\Components\KeyValue::make('config.options')
105106
->label(__('Options'))
106107
->columnSpanFull()
107-
->visible(fn(Forms\Get $get): bool => $get('config.optionType') == 'array')
108-
->required(fn(Forms\Get $get): bool => $get('config.optionType') == 'array'),
108+
->visible(fn (Forms\Get $get): bool => $get('config.optionType') == 'array')
109+
->required(fn (Forms\Get $get): bool => $get('config.optionType') == 'array'),
109110
// Relationship options
110111
Repeater::make('config.relations')
111112
->label(__('Relations'))
@@ -122,19 +123,20 @@ public function optionFormFields(): Fieldset
122123
->afterStateUpdated(function (Forms\Set $set, ?string $state) {
123124
$resources = config('filament-fields.select.resource_options');
124125
$resourceClass = collect($resources)->first(function ($resource) use ($state) {
125-
$res = new $resource();
126+
$res = new $resource;
126127
$model = $res->getModel();
127-
$model = new $model();
128+
$model = new $model;
129+
128130
return $model->getTable() === $state;
129131
});
130132

131-
if (!$resourceClass) {
133+
if (! $resourceClass) {
132134
return;
133135
}
134136

135-
$resource = new $resourceClass();
137+
$resource = new $resourceClass;
136138
$model = $resource->getModel();
137-
$model = new $model();
139+
$model = new $model;
138140

139141
// Get all column names from the table
140142
$columns = Schema::getColumnListing($model->getTable());
@@ -151,31 +153,31 @@ public function optionFormFields(): Fieldset
151153
$resources = config('filament-fields.select.resource_options');
152154

153155
return collect($resources)->map(function ($resource) {
154-
$res = new $resource();
156+
$res = new $resource;
155157
$model = $res->getModel();
156-
$model = new $model();
158+
$model = new $model;
157159

158160
return [
159-
$model->getTable() => Str::title($model->getTable())
161+
$model->getTable() => Str::title($model->getTable()),
160162
];
161163
})
162164
->collapse()
163165
->toArray();
164166
})
165167
->noSearchResultsMessage(__('No types found'))
166-
->required(fn(Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
168+
->required(fn (Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
167169
Forms\Components\Hidden::make('relationKey')
168170
->default('ulid')
169171
->label(__('Key'))
170-
->required(fn(Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
172+
->required(fn (Forms\Get $get): bool => $get('config.optionType') == 'relationship'),
171173
Forms\Components\Repeater::make('relationValue_filters')
172174
->label(__('Filters'))
173-
->visible(fn(Forms\Get $get): bool => ! empty($get('resource')))
175+
->visible(fn (Forms\Get $get): bool => ! empty($get('resource')))
174176
->schema([
175177
Forms\Components\Grid::make(3)
176178
->schema([
177179
Forms\Components\Select::make('column')
178-
->options(fn(\Filament\Forms\Get $get) => $get('../../relationValue_options') ?? [
180+
->options(fn (\Filament\Forms\Get $get) => $get('../../relationValue_options') ?? [
179181
'slug' => __('Slug'),
180182
'name' => __('Name'),
181183
])
@@ -198,23 +200,24 @@ public function optionFormFields(): Fieldset
198200
$resource = $get('../../resource');
199201
$column = $get('column');
200202

201-
if (!$resource || !$column) {
203+
if (! $resource || ! $column) {
202204
return [];
203205
}
204206

205207
$resources = config('filament-fields.select.resource_options');
206208
$resourceClass = collect($resources)->first(function ($r) use ($resource) {
207-
$res = new $r();
209+
$res = new $r;
208210
$model = $res->getModel();
209-
$model = new $model();
211+
$model = new $model;
212+
210213
return $model->getTable() === $resource;
211214
});
212215

213-
if (!$resourceClass) {
216+
if (! $resourceClass) {
214217
return [];
215218
}
216219

217-
$resource = new $resourceClass();
220+
$resource = new $resourceClass;
218221
$model = $resource->getModel();
219222

220223
return $model::query()
@@ -224,14 +227,14 @@ public function optionFormFields(): Fieldset
224227
->toArray();
225228
})
226229
->label(__('Value')),
227-
])
230+
]),
228231
])
229232
->columnSpanFull(),
230233
]),
231234
])
232-
->visible(fn(Forms\Get $get): bool => $get('config.optionType') == 'relationship')
235+
->visible(fn (Forms\Get $get): bool => $get('config.optionType') == 'relationship')
233236
->columnSpanFull(),
234237
]),
235238
]);
236239
}
237-
}
240+
}

‎src/Fields/CheckboxList.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace Vormkracht10\Fields\Fields;
44

55
use Filament\Forms;
6-
use Vormkracht10\Fields\Models\Field;
6+
use Filament\Forms\Components\CheckboxList as Input;
77
use Vormkracht10\Fields\Concerns\HasOptions;
88
use Vormkracht10\Fields\Contracts\FieldContract;
9-
use Filament\Forms\Components\CheckboxList as Input;
9+
use Vormkracht10\Fields\Models\Field;
1010

1111
class CheckboxList extends Base implements FieldContract
1212
{
@@ -94,19 +94,19 @@ public function getForm(): array
9494
//
9595
Forms\Components\TextInput::make('config.noSearchResultsMessage')
9696
->label(__('No search results message'))
97-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
97+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
9898
Forms\Components\TextInput::make('config.searchPrompt')
9999
->label(__('Search prompt'))
100-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
100+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
101101
Forms\Components\TextInput::make('config.searchDebounce')
102102
->numeric()
103103
->minValue(0)
104104
->step(100)
105105
->label(__('Search debounce'))
106-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
106+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
107107
]),
108108
]),
109109
])->columnSpanFull(),
110110
];
111111
}
112-
}
112+
}

‎src/Fields/Select.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace Vormkracht10\Fields\Fields;
44

55
use Filament\Forms;
6-
use Vormkracht10\Fields\Models\Field;
6+
use Filament\Forms\Components\Select as Input;
77
use Vormkracht10\Fields\Concerns\HasAffixes;
88
use Vormkracht10\Fields\Concerns\HasOptions;
9-
use Filament\Forms\Components\Select as Input;
109
use Vormkracht10\Fields\Contracts\FieldContract;
10+
use Vormkracht10\Fields\Models\Field;
1111

1212
class Select extends Base implements FieldContract
1313
{
@@ -106,48 +106,48 @@ public function getForm(): array
106106
->label(__('Preload'))
107107
->live()
108108
->inline(false)
109-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
109+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
110110
])->columnSpanFull(),
111111
self::optionFormFields(),
112112
self::affixFormFields(),
113113
Forms\Components\Grid::make(2)
114114
->schema([
115115
Forms\Components\TextInput::make('config.loadingMessage')
116116
->label(__('Loading message'))
117-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
117+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
118118
Forms\Components\TextInput::make('config.noSearchResultsMessage')
119119
->label(__('No search results message'))
120-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
120+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
121121
Forms\Components\TextInput::make('config.searchPrompt')
122122
->label(__('Search prompt'))
123-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
123+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
124124
Forms\Components\TextInput::make('config.searchingMessage')
125125
->label(__('Searching message'))
126-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
126+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
127127
Forms\Components\TextInput::make('config.searchDebounce')
128128
->numeric()
129129
->minValue(0)
130130
->step(100)
131131
->label(__('Search debounce'))
132-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
132+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
133133
Forms\Components\TextInput::make('config.optionsLimit')
134134
->numeric()
135135
->minValue(0)
136136
->label(__('Options limit'))
137-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
137+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
138138
Forms\Components\TextInput::make('config.minItemsForSearch')
139139
->numeric()
140140
->minValue(0)
141141
->label(__('Min items for search'))
142-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
142+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
143143
Forms\Components\TextInput::make('config.maxItemsForSearch')
144144
->numeric()
145145
->minValue(0)
146146
->label(__('Max items for search'))
147-
->visible(fn(Forms\Get $get): bool => $get('config.searchable')),
147+
->visible(fn (Forms\Get $get): bool => $get('config.searchable')),
148148
]),
149149
]),
150150
])->columnSpanFull(),
151151
];
152152
}
153-
}
153+
}

0 commit comments

Comments
 (0)