wip

Author: iamgergo

src/Fields/Field.php

@@ -516,12 +516,16 @@ public function format(?Closure $callback = null): static
     /**
      * Format the value.
      */
-    public function resolveFormat(Request $request, Model $model): mixed
+    public function resolveFormat(Request $request, Model $model): ?string
     {
         $value = $this->resolveValue($request, $model);
 
         if (is_null($this->formatResolver)) {
-            return is_array($value) ? json_encode($value) : $value;
+            return match (true) {
+                is_array($value) => json_encode($value),
+                is_null($value) => $value,
+                default => (string) $value,
+            };
         }
 
         return call_user_func_array($this->formatResolver, [$request, $model, $value]);

src/Fields/Relation.php

@@ -91,11 +91,6 @@ abstract class Relation extends Field implements Form
      */
     protected ?Closure $aggregateResolver = null;
 
-    /**
-     * Determine whether the relation values are aggregated.
-     */
-    protected bool $aggregated = false;
-
     /**
      * The option group resolver.
      */
@@ -390,7 +385,7 @@ public function resolveDisplay(Model $related): ?string
      */
     public function getValue(Model $model): mixed
     {
-        if ($this->aggregated) {
+        if (is_callable($this->aggregateResolver)) {
             return parent::getValue($model);
         }
 
@@ -412,11 +407,14 @@ public function resolveFormat(Request $request, Model $model): ?string
             $this->formatResolver = function (Request $request, Model $model): mixed {
                 $default = $this->getValue($model);
 
-                if ($this->aggregated) {
-                    return $default;
+                if (is_callable($this->aggregateResolver)) {
+                    return (string) $default;
                 }
 
-                return Collection::wrap($default)->map(fn (Model $related): ?string => $this->formatRelated($request, $model, $related))->filter()->join(', ');
+                return Collection::wrap($default)
+                    ->map(fn (Model $related): ?string => $this->formatRelated($request, $model, $related))
+                    ->filter()
+                    ->join(', ');
             };
         }
 
@@ -540,8 +538,6 @@ public function aggregate(string $fn = 'count', string $column = '*'): static
                 $column === '*' ? '' : sprintf('_%s', $column)
             ));
 
-            $this->aggregated = true;
-
             return $query->withAggregate($this->getRelationName(), $column, $fn);
         };
 

src/Fields/Repeater.php

@@ -209,7 +209,9 @@ public function buildOption(Request $request, Model $model): array
      */
     public function modelUrl(Model $model): string
     {
-        return str_replace('{resourceModel}', $model->exists ? (string) $model->getKey() : 'create', $this->getUri());
+        $key = $model->exists ? (string) $model->getKey() : 'create';
+
+        return str_replace('{resourceModel}', $key, $this->getUri());
     }
 
     /**