Merge branch 'feat/defined-values-based-on-dependant-fields' of github.com:backstagephp/fields into feat/defined-values-based-on-dependant-fields

Author: Baspa

src/Concerns/HasSelectableValues.php

@@ -167,6 +167,7 @@ protected static function mergeRelationshipOptions(array $allOptions, array $rel
                     $flatOptions[$id] = $label;
                 }
             }
+
             return $allOptions + $flatOptions;
         }
     }

src/Fields/Base.php

@@ -171,7 +171,7 @@ public static function applyDefaultSettings($input, ?Field $field = null)
                     ->where('model_key', $field->model_key)
                     ->where(function ($query) use ($field) {
                         $query->where('config->dynamic_source_field', $field->ulid)
-                              ->orWhere('config->dynamic_formula', 'LIKE', "%{{$field->ulid}}%");
+                            ->orWhere('config->dynamic_formula', 'LIKE', "%{{$field->ulid}}%");
                     })
                     ->get();
 

src/Fields/Text.php

@@ -95,55 +95,73 @@ public static function make(string $name, ?Field $field = null): Input
     public static function calculateDynamicValue(Field $field, $sourceValue, ?Get $get = null)
     {
         $mode = $field->config['dynamic_mode'] ?? 'none';
-        
+
         if ($mode === 'relation') {
-            if (empty($sourceValue)) return null;
-            
+            if (empty($sourceValue)) {
+                return null;
+            }
+
             $sourceUlid = $field->config['dynamic_source_field'] ?? null;
-            if (! $sourceUlid) return null;
+            if (! $sourceUlid) {
+                return null;
+            }
 
             $sourceField = \Backstage\Fields\Models\Field::find($sourceUlid);
-            if (! $sourceField) return null;
+            if (! $sourceField) {
+                return null;
+            }
 
             $relations = $sourceField->config['relations'] ?? [];
             $relationConfig = reset($relations);
-            if (! $relationConfig || empty($relationConfig['resource'])) return null;
+            if (! $relationConfig || empty($relationConfig['resource'])) {
+                return null;
+            }
 
             $modelInstance = \Backstage\Fields\Fields\Select::resolveResourceModel($relationConfig['resource']);
-            if (! $modelInstance) return null;
+            if (! $modelInstance) {
+                return null;
+            }
 
             $relatedRecord = $modelInstance::find($sourceValue);
-            if (! $relatedRecord) return null;
+            if (! $relatedRecord) {
+                return null;
+            }
 
             $targetColumn = $field->config['dynamic_relation_column'] ?? null;
             if ($targetColumn && isset($relatedRecord->$targetColumn)) {
                 return $relatedRecord->$targetColumn;
             }
         }
-        
+
         if ($mode === 'calculation') {
-             if (! $get) return null;
-             
-             $formula = $field->config['dynamic_formula'] ?? null;
-             if (! $formula) return null;
-
-             // Regex to find {ulid} patterns
-             $parsedFormula = preg_replace_callback('/\{([a-zA-Z0-9-]+)\}/', function ($matches) use ($get) {
-                 $ulid = $matches[1];
-                 $val = $get("values.{$ulid}");
-                 // Ensure value is numeric for safety
-                 return is_numeric($val) ? $val : 0;
-             }, $formula);
-
-             // Safety: Only allow numbers and basic math operators
-             if (preg_match('/^[0-9\.\+\-\*\/\(\)\s]+$/', $parsedFormula)) {
-                 try {
-                     $result = @eval("return {$parsedFormula};");
-                     return $result;
-                 } catch (\Throwable $e) {
-                     return null;
-                 }
-             }
+            if (! $get) {
+                return null;
+            }
+
+            $formula = $field->config['dynamic_formula'] ?? null;
+            if (! $formula) {
+                return null;
+            }
+
+            // Regex to find {ulid} patterns
+            $parsedFormula = preg_replace_callback('/\{([a-zA-Z0-9-]+)\}/', function ($matches) use ($get) {
+                $ulid = $matches[1];
+                $val = $get("values.{$ulid}");
+
+                // Ensure value is numeric for safety
+                return is_numeric($val) ? $val : 0;
+            }, $formula);
+
+            // Safety: Only allow numbers and basic math operators
+            if (preg_match('/^[0-9\.\+\-\*\/\(\)\s]+$/', $parsedFormula)) {
+                try {
+                    $result = @eval("return {$parsedFormula};");
+
+                    return $result;
+                } catch (\Throwable $e) {
+                    return null;
+                }
+            }
         }
 
         return null;
@@ -156,22 +174,22 @@ protected static function applyDynamicSettings(Input $input, ?Field $field = nul
         }
 
         return $input
-            // We keep afterStateHydrated for initial load, 
+            // We keep afterStateHydrated for initial load,
             // but we remove the `key` hack as we use "Push" model for updates.
             ->afterStateHydrated(function (Input $component, Get $get, Set $set) use ($field) {
                 $mode = $field->config['dynamic_mode'] ?? 'none';
-                
+
                 // Use the shared calculation logic
                 // But we need to resolve sourceValue from $get
                 $sourceUlid = $field->config['dynamic_source_field'] ?? null;
                 if ($sourceUlid) {
-                     $sourceValue = $get("values.{$sourceUlid}");
-                     $newValue = self::calculateDynamicValue($field, $sourceValue); // We need to update this sig for calc?
-                     
-                     if ($newValue !== null && $component->getState() !== $newValue) {
-                         $component->state($newValue);
-                         $set($component->getStatePath(), $newValue);
-                     }
+                    $sourceValue = $get("values.{$sourceUlid}");
+                    $newValue = self::calculateDynamicValue($field, $sourceValue); // We need to update this sig for calc?
+
+                    if ($newValue !== null && $component->getState() !== $newValue) {
+                        $component->state($newValue);
+                        $set($component->getStatePath(), $newValue);
+                    }
                 }
             });
     }
@@ -327,7 +345,7 @@ public function getForm(): array
 
                                             $relations = $sourceField->config['relations'] ?? [];
                                             $relationConfig = reset($relations);
-                                            
+
                                             if (! $relationConfig || empty($relationConfig['resource'])) {
                                                 return [];
                                             }
@@ -338,7 +356,7 @@ public function getForm(): array
                                             }
 
                                             $columns = \Illuminate\Support\Facades\Schema::getColumnListing($modelInstance->getTable());
-                                            
+
                                             return collect($columns)->mapWithKeys(function ($column) {
                                                 return [$column => $column];
                                             })->toArray();