[Bug]: Cannot Get Correct Tenant On Custom Multitenancy RelationShip

[OccTherapist]

What happened?

When using an other user tenant relationship than teams it throws this error:

Call to a member function newCollection() on null

When I change the global scope on the teams model to my custom relationship it works.

A generic solution would be nice.

How to reproduce the bug

Use a custom user tenant relationship e.g. belognsToMany facilities and try to open EmailResource.

Package Version

1.6.2

PHP Version

8.3

Laravel Version

11.22.0

Which operating systems does with happen with?

Linux

Notes

No response

[marcogermani87]

Hi @OccTherapist, thanks for reporting! You can share User and Team models?

[OccTherapist]

Here is the user models relationship:

public function facilities(): \Illuminate\Database\Eloquent\Relations\BelongsToMany
{
     return $this->belongsToMany(Facility::class, 'facility_user', 'user_id', 'facility_id');
}

And here is my tenants model relationship:

public function users(): \Illuminate\Database\Eloquent\Relations\BelongsToMany
{
    return $this->belongsToMany(User::class);
}

[marcogermani87]

Take a look to the demo project: https://github.com/marcogermani87/filament-email-demo

Try to change Team method users() to:

public function members(): BelongsToMany
{
    return $this->belongsToMany(User::class);
}

Team model must have members() method: https://filamentphp.com/docs/3.x/panels/tenancy#adding-a-tenant-registration-page

[OccTherapist]

Thats okay,

I also had to extend your Email Model

<?php

namespace App\Models;

use RickDBCN\FilamentEmail\Models\Email as BaseEmail;

class Email extends BaseEmail
{
    public function facility(): \Illuminate\Database\Eloquent\Relations\BelongsTo
    {
        return $this->belongsTo(Facility::class, 'team_id');
    }
}

But it shows no sent Emails in the Resource. In the database there is no team_id attached on the filament_email_log table for the entries.