fix: add missing site ulid to resources

packages/core/src/Models/Block.php

@@ -39,7 +39,7 @@ protected function casts(): array
 
     public function sites(): BelongsToMany
     {
-        return $this->belongsToMany(Site::class);
+        return $this->belongsToMany(Site::class, 'block_site', 'block_ulid', 'site_ulid');
     }
 
     public function render(): HtmlString

packages/core/src/Models/Concerns/BelongsToCurrentTenant.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Backstage\Models\Concerns;
+
+use Filament\Facades\Filament;
+
+trait BelongsToCurrentTenant
+{
+    public static function bootBelongsToCurrentTenant(): void
+    {
+        static::creating(function ($model) {
+            if (! $model->site_ulid && Filament::getTenant()) {
+                $model->site_ulid = Filament::getTenant()->ulid;
+            }
+        });
+    }
+}

packages/core/src/Models/Content.php

@@ -8,6 +8,7 @@
 use Backstage\Fields\Models\Field;
 use Backstage\Jobs\TranslateContent;
 use Backstage\Media\Concerns\HasMedia;
+use Backstage\Models\Concerns\BelongsToCurrentTenant;
 use Backstage\Models\Concerns\HasContentRelations;
 use Backstage\Observers\ContentDepthObserver;
 use Backstage\Observers\ContentRevisionObserver;
@@ -70,6 +71,7 @@
 #[ObservedBy(ContentRevisionObserver::class)]
 class Content extends Model
 {
+    use BelongsToCurrentTenant;
     use DecodesJsonStrings;
     use HasContentRelations;
     use HasFields;

packages/core/src/Models/Domain.php

@@ -2,6 +2,7 @@
 
 namespace Backstage\Models;
 
+use Backstage\Models\Concerns\BelongsToCurrentTenant;
 use Backstage\Shared\HasPackageFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Model;
@@ -10,6 +11,7 @@
 
 class Domain extends Model
 {
+    use BelongsToCurrentTenant;
     use HasPackageFactory;
     use HasUlids;
 

packages/core/src/Models/Form.php

@@ -3,6 +3,7 @@
 namespace Backstage\Models;
 
 use Backstage\Fields\Models\Field;
+use Backstage\Models\Concerns\BelongsToCurrentTenant;
 use Backstage\Shared\HasPackageFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -11,6 +12,7 @@
 
 class Form extends Model
 {
+    use BelongsToCurrentTenant;
     use HasPackageFactory;
 
     protected $primaryKey = 'slug';

packages/core/src/Models/FormAction.php

@@ -3,6 +3,7 @@
 namespace Backstage\Models;
 
 use Backstage\Mail\FormActionExecute;
+use Backstage\Models\Concerns\BelongsToCurrentTenant;
 use Backstage\Shared\HasPackageFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Model;
@@ -13,6 +14,7 @@
  */
 class FormAction extends Model
 {
+    use BelongsToCurrentTenant;
     use HasPackageFactory;
     use HasUlids;
 

packages/core/src/Models/Menu.php

@@ -2,13 +2,15 @@
 
 namespace Backstage\Models;
 
+use Backstage\Models\Concerns\BelongsToCurrentTenant;
 use Backstage\Shared\HasPackageFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Menu extends Model
 {
+    use BelongsToCurrentTenant;
     use HasPackageFactory;
 
     protected $primaryKey = 'slug';

packages/core/src/Models/Setting.php

@@ -3,6 +3,7 @@
 namespace Backstage\Models;
 
 use Backstage\Fields\Concerns\HasFields;
+use Backstage\Models\Concerns\BelongsToCurrentTenant;
 use Backstage\Models\Concerns\HasContentRelations;
 use Backstage\Shared\HasPackageFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUlids;
@@ -18,6 +19,7 @@
  */
 class Setting extends Model
 {
+    use BelongsToCurrentTenant;
     use HasContentRelations;
     use HasFields;
     use HasPackageFactory;

packages/core/src/Models/Site.php

@@ -61,17 +61,17 @@ public function settings(): HasMany
 
     public function types(): BelongsToMany
     {
-        return $this->belongsToMany(Type::class);
+        return $this->belongsToMany(Type::class, 'site_type', 'site_ulid', 'type_slug');
     }
 
     public function users(): BelongsToMany
     {
-        return $this->belongsToMany(User::class);
+        return $this->belongsToMany(User::class, 'site_user', 'site_ulid', 'user_id');
     }
 
     public function blocks(): BelongsToMany
     {
-        return $this->belongsToMany(Block::class);
+        return $this->belongsToMany(Block::class, 'block_site', 'site_ulid', 'block_ulid');
     }
 
     public function forms(): HasMany

packages/core/src/Models/Template.php

@@ -34,6 +34,6 @@ public function fields(): MorphToMany
 
     public function sites(): BelongsToMany
     {
-        return $this->belongsToMany(Site::class);
+        return $this->belongsToMany(Site::class, 'site_template', 'template_slug', 'site_ulid');
     }
 }

packages/core/src/Models/Type.php

@@ -32,7 +32,7 @@ protected function casts(): array
 
     public function sites(): BelongsToMany
     {
-        return $this->belongsToMany(Site::class);
+        return $this->belongsToMany(Site::class, 'site_type', 'type_slug', 'site_ulid');
     }
 
     public function getTemplateAttribute(): string

packages/core/src/Models/User.php

@@ -83,7 +83,7 @@ class User extends Authenticatable implements FilamentUser, HasAppAuthentication
 
     public function sites(): BelongsToMany
     {
-        return $this->belongsToMany(Site::class);
+        return $this->belongsToMany(Site::class, 'site_user', 'user_id', 'site_ulid');
     }
 
     public function settings(): BelongsToMany

packages/core/src/Resources/BlockResource/Pages/CreateBlock.php

@@ -3,9 +3,15 @@
 namespace Backstage\Resources\BlockResource\Pages;
 
 use Backstage\Resources\BlockResource;
+use Filament\Facades\Filament;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateBlock extends CreateRecord
 {
     protected static string $resource = BlockResource::class;
+
+    protected function afterCreate(): void
+    {
+        $this->record->sites()->attach(Filament::getTenant());
+    }
 }

packages/core/src/Resources/ContentResource/Pages/CreateContent.php

@@ -5,7 +5,6 @@
 use Backstage\Fields\Concerns\CanMapDynamicFields;
 use Backstage\Fields\Concerns\PersistsContentData;
 use Backstage\Resources\ContentResource;
-use Filament\Facades\Filament;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateContent extends CreateRecord
@@ -50,10 +49,6 @@ protected function mutateFormDataBeforeCreate(array $data): array
         unset($data['tags']);
         unset($data['values']);
 
-        if (! isset($data['site_ulid']) && Filament::getTenant()) {
-            $data['site_ulid'] = Filament::getTenant()->ulid;
-        }
-
         return $data;
     }
 

packages/core/src/Resources/FormResource/RelationManagers/ActionsRelationManager.php

@@ -9,7 +9,6 @@
 use Filament\Actions\DeleteAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
-use Filament\Facades\Filament;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
@@ -174,12 +173,6 @@ public function table(Table $table): Table
             ->headerActions([
                 CreateAction::make()
                     ->slideOver()
-                    ->mutateDataUsing(function (array $data) {
-                        return [
-                            ...$data,
-                            'site_ulid' => Filament::getTenant()->ulid,
-                        ];
-                    })
                     ->after(function (Component $livewire) {
                         $livewire->dispatch('refreshFields');
                     }),

packages/core/src/Resources/SettingResource/Pages/CreateSetting.php

@@ -8,9 +8,4 @@
 class CreateSetting extends CreateRecord
 {
     protected static string $resource = SettingResource::class;
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        return $data;
-    }
 }

packages/core/src/Resources/TemplateResource/Pages/CreateTemplate.php

@@ -3,9 +3,15 @@
 namespace Backstage\Resources\TemplateResource\Pages;
 
 use Backstage\Resources\TemplateResource;
+use Filament\Facades\Filament;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateTemplate extends CreateRecord
 {
     protected static string $resource = TemplateResource::class;
+
+    protected function afterCreate(): void
+    {
+        $this->record->sites()->attach(Filament::getTenant());
+    }
 }

packages/core/src/Resources/TypeResource/Pages/CreateType.php

@@ -3,9 +3,15 @@
 namespace Backstage\Resources\TypeResource\Pages;
 
 use Backstage\Resources\TypeResource;
+use Filament\Facades\Filament;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateType extends CreateRecord
 {
     protected static string $resource = TypeResource::class;
+
+    protected function afterCreate(): void
+    {
+        $this->record->sites()->attach(Filament::getTenant());
+    }
 }