Merge branch 'main' into feature/tree

Author: Reinhold-Jesse

.github/workflows/cleanup-empty-translations.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@v6.0.3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/monorepo-split-packages.yml

@@ -86,7 +86,7 @@ jobs:
 
 
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@v6.0.3
 
       # Search and replace "moox/core": "*" with "moox/core": "^3.1.3" in composer.json
       - name: Replace core version in composer.json

.github/workflows/monorepo-split-plugins.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@v6.0.3
 
       - if: "!startsWith(github.ref, 'refs/tags/')"
         uses: "symplify/monorepo-split-github-action@v2.4.5"

.github/workflows/pest.yml

@@ -35,7 +35,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@v6.0.3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -93,7 +93,7 @@ jobs:
     needs: pest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@v6.0.3
 
       - name: Download Coverage Report
         uses: actions/download-artifact@v8

.github/workflows/pint.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
         with:
           ref: ${{ github.head_ref }}
           token: ${{ secrets.BOT || github.token }}

.github/workflows/scorecard.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 

.github/workflows/split.yml

@@ -73,7 +73,7 @@ jobs:
         package: ${{ fromJson(needs.prepare.outputs.package-list) }}
 
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@v6.0.3
 
       - name: Get package stability and determine version
         working-directory: packages/${{ matrix.package }}

packages/address/config/address.php

@@ -122,8 +122,14 @@
                 'delivery_address',
             ],
             'owner_types' => [
-                'Moox\Company\Models\Company' => 'Company',
-                // 'Heco\Contact\Models\Contact' => 'Contact',
+                // 'Moox\Company\Models\Company' => [
+                //     'label' => 'Company',
+                //     'title_attribute' => 'display_name',
+                // ],
+                // 'Moox\Contact\Models\Contact' => [
+                //     'label' => 'Contact',
+                //     'title_attribute' => 'display_name',
+                // ],
             ],
         ],
     ],

packages/address/src/Resources/Address/RelationManagers/AddressablesRelationManager.php

@@ -16,6 +16,7 @@
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Schema as DatabaseSchema;
 use Moox\Address\Support\AddressRelationConfig;
 use Override;
 
@@ -45,7 +46,12 @@ public function form(Schema $schema): Schema
                 ->label(__('address::fields.owner'))
                 ->types(
                     collect($ownerTypes)
-                        ->map(fn (string $label, string $class): Type => Type::make($class)->label($label))
+                        ->map(fn (string $label, string $class): Type => Type::make($class)
+                            ->label($label)
+                            ->titleAttribute($this->resolveTitleAttributeForMorphType($class))
+                            ->getOptionLabelFromRecordUsing(
+                                fn (Model $record): string => $this->resolveOptionLabel($record)
+                            ))
                         ->values()
                         ->all()
                 )
@@ -108,4 +114,42 @@ public function table(Table $table): Table
                 DeleteAction::make(),
             ]);
     }
+
+    private function resolveTitleAttributeForMorphType(string $class): string
+    {
+        $configured = AddressRelationConfig::titleAttributeForOwnerType($class);
+
+        if ($configured !== null) {
+            return $configured;
+        }
+
+        $model = app($class);
+        $table = $model->getTable();
+        $schema = DatabaseSchema::connection($model->getConnectionName());
+
+        foreach (['display_name', 'name', 'title'] as $column) {
+            if ($schema->hasColumn($table, $column)) {
+                return $column;
+            }
+        }
+
+        return $model->getKeyName();
+    }
+
+    private function resolveOptionLabel(Model $record): string
+    {
+        if (method_exists($record, 'displayLabel')) {
+            return (string) $record->displayLabel();
+        }
+
+        foreach (['display_name', 'name', 'title'] as $attribute) {
+            $value = $record->getAttribute($attribute);
+
+            if (is_string($value) && $value !== '') {
+                return $value;
+            }
+        }
+
+        return (string) $record->getKey();
+    }
 }

packages/address/src/Support/AddressRelationConfig.php

@@ -38,14 +38,61 @@ public static function pivotColumns(): array
         return $columns;
     }
 
+    /**
+     * @return array<class-string, array{label: string, title_attribute: ?string}>
+     */
+    public static function ownerTypeDefinitions(): array
+    {
+        /** @var array<class-string, string|array{label?: string, title_attribute?: string}> $raw */
+        $raw = self::addressables()['owner_types'] ?? [];
+
+        $definitions = [];
+
+        foreach ($raw as $class => $definition) {
+            if (! is_string($class) || $class === '') {
+                continue;
+            }
+
+            if (is_string($definition)) {
+                $definitions[$class] = [
+                    'label' => $definition,
+                    'title_attribute' => null,
+                ];
+
+                continue;
+            }
+
+            if (! is_array($definition)) {
+                continue;
+            }
+
+            $definitions[$class] = [
+                'label' => (string) ($definition['label'] ?? class_basename($class)),
+                'title_attribute' => isset($definition['title_attribute']) && is_string($definition['title_attribute']) && $definition['title_attribute'] !== ''
+                    ? $definition['title_attribute']
+                    : null,
+            ];
+        }
+
+        return $definitions;
+    }
+
     /**
      * @return array<class-string, string>
      */
     public static function ownerTypes(): array
     {
-        /** @var array<class-string, string> $types */
-        $types = self::addressables()['owner_types'] ?? [];
+        $labels = [];
 
-        return $types;
+        foreach (self::ownerTypeDefinitions() as $class => $definition) {
+            $labels[$class] = $definition['label'];
+        }
+
+        return $labels;
+    }
+
+    public static function titleAttributeForOwnerType(string $class): ?string
+    {
+        return self::ownerTypeDefinitions()[$class]['title_attribute'] ?? null;
     }
 }