Skip to content

Commit d130fdb

Browse files
Baspagithub-actions[bot]
Baspa
authored and
github-actions[bot]
committed
Fix styling
1 parent 91720fb commit d130fdb

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed

‎src/Concerns/CanMapDynamicFields.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -425,20 +425,17 @@ private function resolveFieldInput(Model $field, Collection $customFields, mixed
425425

426426
$inputName = $this->generateInputName($field, $record, $isNested);
427427

428-
429428
// Try to resolve from custom fields first (giving them priority)
430429
if ($customFieldClass = $customFields->get($field->field_type)) {
431430
$input = $customFieldClass::make($inputName, $field);
432-
433-
431+
434432
return $input;
435433
}
436434

437435
// Fall back to standard field type map if no custom field found
438436
if ($fieldClass = self::FIELD_TYPE_MAP[$field->field_type] ?? null) {
439437
$input = $fieldClass::make(name: $inputName, field: $field);
440-
441-
438+
442439
return $input;
443440
}
444441

@@ -448,7 +445,7 @@ private function resolveFieldInput(Model $field, Collection $customFields, mixed
448445
private function generateInputName(Model $field, mixed $record, bool $isNested): string
449446
{
450447
$name = $isNested ? "{$field->ulid}" : "{$record->valueColumn}.{$field->ulid}";
451-
448+
452449
return $name;
453450
}
454451

‎src/Concerns/HasSelectableValues.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait HasSelectableValues
1818
protected static function resolveResourceModel(string $tableName): ?object
1919
{
2020
$resources = config('backstage.fields.selectable_resources');
21-
21+
2222
$resourceClass = collect($resources)->first(function ($resource) use ($tableName) {
2323
$res = new $resource;
2424
$model = $res->getModel();
@@ -100,7 +100,6 @@ protected static function buildRelationshipOptions(mixed $field): array
100100
{
101101
$relationshipOptions = [];
102102

103-
104103
foreach ($field->config['relations'] ?? [] as $relation) {
105104
if (! isset($relation['resource'])) {
106105
continue;
@@ -117,8 +116,8 @@ protected static function buildRelationshipOptions(mixed $field): array
117116
// Apply filters if they exist
118117
if (isset($relation['relationValue_filters'])) {
119118
foreach ($relation['relationValue_filters'] as $filter) {
120-
if (isset($filter['column'], $filter['operator'], $filter['value']) &&
121-
!empty($filter['column']) && !empty($filter['operator']) && $filter['value'] !== null) {
119+
if (isset($filter['column'], $filter['operator'], $filter['value']) &&
120+
! empty($filter['column']) && ! empty($filter['operator']) && $filter['value'] !== null) {
122121
if (preg_match('/{session\.([^\}]+)}/', $filter['value'], $matches)) {
123122
$sessionValue = session($matches[1]);
124123
$filter['value'] = str_replace($matches[0], $sessionValue, $filter['value']);
@@ -130,7 +129,6 @@ protected static function buildRelationshipOptions(mixed $field): array
130129

131130
$results = $query->get();
132131

133-
134132
if ($results->isEmpty()) {
135133
continue;
136134
}

‎src/Fields/Repeater.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22

33
namespace Backstage\Fields\Fields;
44

5-
use Filament\Forms;
6-
use Illuminate\Support\Str;
7-
use Forms\Components\Placeholder;
8-
use Backstage\Fields\Models\Field;
9-
use Illuminate\Support\Collection;
5+
use Backstage\Fields\Concerns\HasConfigurableFields;
6+
use Backstage\Fields\Concerns\HasFieldTypeResolver;
7+
use Backstage\Fields\Concerns\HasOptions;
8+
use Backstage\Fields\Contracts\FieldContract;
9+
use Backstage\Fields\Enums\Field as FieldEnum;
1010
use Backstage\Fields\Facades\Fields;
11+
use Backstage\Fields\Models\Field;
12+
use Filament\Forms;
1113
use Filament\Forms\Components\Hidden;
14+
use Filament\Forms\Components\Repeater as Input;
15+
use Filament\Forms\Components\Repeater\TableColumn;
1216
use Filament\Forms\Components\Select;
13-
use Filament\Schemas\Components\Grid;
14-
use Filament\Schemas\Components\Tabs;
15-
use Filament\Support\Enums\Alignment;
1617
use Filament\Forms\Components\TextInput;
18+
use Filament\Schemas\Components\Grid;
1719
use Filament\Schemas\Components\Section;
18-
use Backstage\Fields\Concerns\HasOptions;
20+
use Filament\Schemas\Components\Tabs;
1921
use Filament\Schemas\Components\Tabs\Tab;
20-
use Backstage\Fields\Contracts\FieldContract;
21-
use Backstage\Fields\Enums\Field as FieldEnum;
2222
use Filament\Schemas\Components\Utilities\Get;
2323
use Filament\Schemas\Components\Utilities\Set;
24-
use Filament\Forms\Components\Repeater as Input;
25-
use Backstage\Fields\Concerns\HasFieldTypeResolver;
26-
use Filament\Forms\Components\Repeater\TableColumn;
27-
use Backstage\Fields\Concerns\HasConfigurableFields;
24+
use Filament\Support\Enums\Alignment;
25+
use Forms\Components\Placeholder;
26+
use Illuminate\Support\Collection;
27+
use Illuminate\Support\Str;
2828
use Saade\FilamentAdjacencyList\Forms\Components\AdjacencyList;
2929

3030
class Repeater extends Base implements FieldContract
@@ -80,11 +80,11 @@ public static function make(string $name, ?Field $field = null): Input
8080

8181
if ($field && $field->children->count() > 0) {
8282
$input = $input->schema(self::generateSchemaFromChildren($field->children));
83-
83+
8484
// Apply table mode if enabled
8585
if ($field->config['tableMode'] ?? self::getDefaultConfig()['tableMode']) {
8686
$tableColumns = self::generateTableColumnsFromChildren($field->children, $field->config['tableColumns'] ?? []);
87-
if (!empty($tableColumns)) {
87+
if (! empty($tableColumns)) {
8888
$input = $input->table($tableColumns);
8989
}
9090
}
@@ -141,7 +141,7 @@ public function getForm(): array
141141
->label(__('Columns'))
142142
->default(1)
143143
->numeric()
144-
->visible(fn (Get $get): bool => !($get('config.tableMode') ?? false)),
144+
->visible(fn (Get $get): bool => ! ($get('config.tableMode') ?? false)),
145145
AdjacencyList::make('config.form')
146146
->columnSpanFull()
147147
->label(__('Fields'))
@@ -260,38 +260,38 @@ private static function generateTableColumnsFromChildren(Collection $children, a
260260
foreach ($children as $child) {
261261
$slug = $child['slug'];
262262
$name = $child['name'];
263-
263+
264264
$columnConfig = $tableColumnsConfig[$slug] ?? [];
265-
265+
266266
$tableColumn = TableColumn::make($name);
267-
267+
268268
// Apply custom configuration if provided
269269
if (isset($columnConfig['hiddenHeaderLabel']) && $columnConfig['hiddenHeaderLabel']) {
270270
$tableColumn = $tableColumn->hiddenHeaderLabel();
271271
}
272-
272+
273273
if (isset($columnConfig['markAsRequired']) && $columnConfig['markAsRequired']) {
274274
$tableColumn = $tableColumn->markAsRequired();
275275
}
276-
276+
277277
if (isset($columnConfig['wrapHeader']) && $columnConfig['wrapHeader']) {
278278
$tableColumn = $tableColumn->wrapHeader();
279279
}
280-
280+
281281
if (isset($columnConfig['alignment'])) {
282-
$alignment = match($columnConfig['alignment']) {
282+
$alignment = match ($columnConfig['alignment']) {
283283
'start' => Alignment::Start,
284284
'center' => Alignment::Center,
285285
'end' => Alignment::End,
286286
default => Alignment::Start,
287287
};
288288
$tableColumn = $tableColumn->alignment($alignment);
289289
}
290-
290+
291291
if (isset($columnConfig['width'])) {
292292
$tableColumn = $tableColumn->width($columnConfig['width']);
293293
}
294-
294+
295295
$tableColumns[] = $tableColumn;
296296
}
297297

‎src/Fields/Select.php‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ public static function make(string $name, ?Field $field = null): Input
7070
if (isset($field->config['dependsOnField']) && $field->config['dependsOnField']) {
7171
$input = self::addFieldDependency($input, $field);
7272
}
73-
73+
7474
// Add dynamic options first (from relationships, etc.)
7575
$input = self::addOptionsToInput($input, $field);
76-
76+
7777
// Set static options as fallback if no dynamic options were added
78-
if (empty($field->config['optionType']) || !is_array($field->config['optionType']) || !in_array('relationship', $field->config['optionType'])) {
78+
if (empty($field->config['optionType']) || ! is_array($field->config['optionType']) || ! in_array('relationship', $field->config['optionType'])) {
7979
$input = $input->options($field->config['options'] ?? self::getDefaultConfig()['options']);
8080
}
8181

@@ -110,13 +110,12 @@ protected static function addFieldDependency(Input $input, Field $field): Input
110110
// The field name in the form is {valueColumn}.{field_ulid}
111111
$dependentFieldName = "values.{$dependsOnField}";
112112
$dependentValue = $get($dependentFieldName);
113-
113+
114114
// Show this field only when the dependent field has a value
115-
return !empty($dependentValue);
115+
return ! empty($dependentValue);
116116
});
117117
}
118118

119-
120119
public static function mutateFormDataCallback(Model $record, Field $field, array $data): array
121120
{
122121
if (! property_exists($record, 'valueColumn')) {
@@ -258,30 +257,30 @@ public function getForm(): array
258257
->options(function ($record, $component) {
259258
// Try to get the form slug from various sources
260259
$formSlug = null;
261-
260+
262261
// Method 1: From the record's model_key (most reliable)
263262
if ($record && isset($record->model_key)) {
264263
$formSlug = $record->model_key;
265264
}
266-
265+
267266
// Method 2: From route parameters as fallback
268-
if (!$formSlug) {
267+
if (! $formSlug) {
269268
$routeParams = request()->route()?->parameters() ?? [];
270269
$formSlug = $routeParams['record'] ?? $routeParams['form'] ?? $routeParams['id'] ?? null;
271270
}
272-
271+
273272
// Method 3: Try to get from the component's owner record if available
274-
if (!$formSlug && method_exists($component, 'getOwnerRecord')) {
273+
if (! $formSlug && method_exists($component, 'getOwnerRecord')) {
275274
$ownerRecord = $component->getOwnerRecord();
276275
if ($ownerRecord) {
277276
$formSlug = $ownerRecord->getKey();
278277
}
279278
}
280-
281-
if (!$formSlug) {
279+
280+
if (! $formSlug) {
282281
return ['debug' => 'No form slug found. Record: ' . ($record ? json_encode($record->toArray()) : 'null')];
283282
}
284-
283+
285284
// Get all select fields in the same form
286285
$fields = \Backstage\Fields\Models\Field::where('model_type', 'App\Models\Form')
287286
->where('model_key', $formSlug)
@@ -292,17 +291,17 @@ public function getForm(): array
292291
->orderBy('name')
293292
->pluck('name', 'ulid')
294293
->toArray();
295-
294+
296295
if (empty($fields)) {
297296
return ['debug' => 'No select fields found for form: ' . $formSlug . '. Total fields: ' . \Backstage\Fields\Models\Field::where('model_type', 'App\Models\Form')->where('model_key', $formSlug)->count()];
298297
}
299-
298+
300299
return $fields;
301300
})
302301
->searchable()
303302
->live(),
304303
]),
305-
]),
304+
]),
306305
Tab::make('Rules')
307306
->label(__('Rules'))
308307
->schema([

‎src/Models/Field.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace Backstage\Fields\Models;
44

55
use Backstage\Fields\Shared\HasPackageFactory;
6-
use Carbon\Carbon;
7-
use Illuminate\Database\Eloquent\Collection;
86
use Illuminate\Database\Eloquent\Concerns\HasUlids;
97
use Illuminate\Database\Eloquent\Model;
108
use Illuminate\Database\Eloquent\Relations\BelongsTo;

‎tests/SelectCascadingTest.php‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
$reflection = new ReflectionClass($input);
4949
$liveProperty = $reflection->getProperty('isLive');
5050
$liveProperty->setAccessible(true);
51-
51+
5252
expect($liveProperty->getValue($input))->toBeTrue();
5353
});
5454

@@ -67,7 +67,7 @@
6767
$reflection = new ReflectionClass($input);
6868
$liveProperty = $reflection->getProperty('isLive');
6969
$liveProperty->setAccessible(true);
70-
70+
7171
$isLive = $liveProperty->getValue($input);
7272
expect($isLive)->toBeNull(); // Regular select fields don't have isLive set
7373
});
@@ -78,8 +78,10 @@
7878
'config' => ['multiple' => false],
7979
]);
8080

81-
$record = new class extends Model {
81+
$record = new class extends Model
82+
{
8283
public $valueColumn = 'values';
84+
8385
public $values = ['test_field' => 'single_value'];
8486
};
8587

@@ -95,8 +97,10 @@
9597
'config' => ['multiple' => true],
9698
]);
9799

98-
$record = new class extends Model {
100+
$record = new class extends Model
101+
{
99102
public $valueColumn = 'values';
103+
100104
public $values = ['test_field' => '["value1", "value2"]'];
101105
};
102106

@@ -112,8 +116,10 @@
112116
'config' => ['multiple' => false],
113117
]);
114118

115-
$record = new class extends Model {
119+
$record = new class extends Model
120+
{
116121
public $valueColumn = 'values';
122+
117123
public $values = ['test_field' => null];
118124
};
119125

@@ -130,8 +136,10 @@
130136
'config' => ['multiple' => true],
131137
]);
132138

133-
$record = new class extends Model {
139+
$record = new class extends Model
140+
{
134141
public $valueColumn = 'values';
142+
135143
public $values = ['test_field' => null];
136144
};
137145

0 commit comments

Comments
 (0)