Merge branch '2.x' of github.com:backstagephp/cms into 2.x

Author: Backstage

src/Fields/Base.php

@@ -202,7 +202,19 @@ public static function getFieldValueFromRecord(Model $record, Field $field): mix
 
             // Handle relationship-based values (like Content model)
             if (self::isRelationship($values)) {
-                $fieldValue = $values->where('field_ulid', $field->ulid)->first();
+                $fieldValue = $values->where(function ($query) use ($field) {
+                    $query->where('field_ulid', $field->ulid)
+                          ->orWhere('ulid', $field->ulid);
+                })->first();
+
+                if ($field->slug === 'banner-image') {
+                     \Illuminate\Support\Facades\Log::info("[BASE DEBUG] getFieldValueFromRecord relation check", [
+                         'field_ulid' => $field->ulid,
+                         'record_key' => $record->getKey(),
+                         'found' => (bool) $fieldValue,
+                         'sql' => $values->where('field_ulid', $field->ulid)->toSql(), 
+                     ]);
+                }
                 $result = $fieldValue ? self::resolveHydratedValue($fieldValue) : null;
             }
         }

src/Fields/Repeater.php

@@ -25,7 +25,10 @@
 use Illuminate\Support\Str;
 use Saade\FilamentAdjacencyList\Forms\Components\AdjacencyList;
 
-class Repeater extends Base implements FieldContract
+use Backstage\Fields\Contracts\HydratesValues;
+use Illuminate\Database\Eloquent\Model;
+
+class Repeater extends Base implements FieldContract, HydratesValues
 {
     use HasConfigurableFields;
     use HasFieldTypeResolver;
@@ -36,6 +39,58 @@ public function getFieldType(): ?string
         return 'repeater';
     }
 
+    public function hydrate(mixed $value, ?Model $model = null): mixed
+    {
+        if (! is_array($value)) {
+            return $value;
+        }
+
+        if (empty($this->field_model)) {
+            file_put_contents('/tmp/repeater_debug.log', "Field model missing for repeater.\n", FILE_APPEND);
+            return $value;
+        }
+
+        $children = $this->field_model->children->keyBy('ulid');
+        $slugMap = $this->field_model->children->pluck('ulid', 'slug');
+
+        file_put_contents('/tmp/repeater_debug.log', "Hydrating Repeater " . $this->field_model->ulid . " with children slugs: " . implode(', ', $slugMap->keys()->toArray()) . "\n", FILE_APPEND);
+
+        $hydrated = [];
+
+        foreach ($value as $key => $row) {
+            $hydratedRow = $row;
+
+            if (is_array($row)) {
+                foreach ($row as $fieldSlug => $fieldValue) {
+                    $fieldUlid = $slugMap[$fieldSlug] ?? null;
+                    if ($fieldUlid && isset($children[$fieldUlid])) {
+                        $fieldModel = $children[$fieldUlid];
+                        $fieldClass = self::resolveFieldTypeClassName($fieldModel->field_type);
+                        
+                        file_put_contents('/tmp/repeater_debug.log', "  > Hydrating field $fieldSlug ($fieldModel->field_type) using $fieldClass\n", FILE_APPEND);
+
+                        if ($fieldClass && in_array(HydratesValues::class, class_implements($fieldClass))) {
+                            // Instantiate the field class to access its hydrate method
+                            // We need to set the field model on the instance if possible, 
+                            // or at least pass context if needed.
+                            // Assuming simpler 'make' or instantiation works for hydration context.
+                            $fieldInstance = new $fieldClass();
+                            if (property_exists($fieldInstance, 'field_model')) {
+                                $fieldInstance->field_model = $fieldModel;
+                            }
+                            
+                            $hydratedRow[$fieldSlug] = $fieldInstance->hydrate($fieldValue, $model);
+                        }
+                    }
+                }
+            }
+
+            $hydrated[$key] = $hydratedRow;
+        }
+
+        return $hydrated;
+    }
+
     public static function getDefaultConfig(): array
     {
         return [