Fixed races character datagrid

app/Http/Controllers/Races/MemberController.php

@@ -24,12 +24,10 @@ public function index(Campaign $campaign, Race $race)
         $this->campaign($campaign)->authEntityView($race->entity);
 
         $options = ['campaign' => $campaign, 'race' => $race];
-        $filters = [];
-        $relation = 'characterRaces';
+        $relation = 'allCharacterRaces';
         if (request()->has('race_id')) {
             $options['race_id'] = (int) request()->get('race_id');
-            $filters['race_id'] = $options['race_id'];
-            $relation = 'characters';
+            $relation = 'characterRaces';
         }
         Datagrid::layout(\App\Renderers\Layouts\Race\Character::class)
             ->route('races.characters', $options);
@@ -45,7 +43,6 @@ public function index(Campaign $campaign, Race $race)
             ->has('character.entity')
             ->leftJoin('characters as c', 'c.id', 'character_race.character_id')
             ->sort(request()->only(['o', 'k']), ['c.name' => 'asc'])
-            ->filter($filters)
             ->paginate(15);
 
         return $this->campaign($campaign)->datagridAjax();

app/Models/Character.php

@@ -249,6 +249,11 @@ public function races(): BelongsToMany
             ->with('entity');
     }
 
+    public function publicRaces(): BelongsToMany
+    {
+        return $this->races()->where('character_race.is_private', false);
+    }
+
     public function organisationMemberships(): HasMany
     {
         return $this->hasMany('App\Models\OrganisationMember', 'character_id', 'id');

app/Models/CharacterRace.php

@@ -7,6 +7,7 @@
 use App\Models\Concerns\Privatable;
 use App\Models\Concerns\SortableTrait;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
@@ -32,6 +33,11 @@ class CharacterRace extends Model
         'is_private',
     ];
 
+    protected array $sortable = [
+        'character.name',
+        'character.type',
+    ];
+
     public function character(): BelongsTo
     {
         return $this->belongsTo(Character::class);
@@ -44,6 +50,15 @@ public function race(): BelongsTo
 
     public function getCharacterRacesAttribute()
     {
-        return $this->character->races;
+        if (auth()->check() && auth()->user()->isAdmin()) {
+            return $this->character()->with('races')->first()->races;
+        }
+
+        return $this->character->publicRaces()->get();
+    }
+
+    public function getCharacterLocationAttribute()
+    {
+        return $this->character->location;
     }
 }

app/Models/Race.php

@@ -189,7 +189,7 @@ public function characterRaces(): HasMany
     }
 
     /**
-     * Get all characters in the location and descendants
+     * Get all characters in the race and descendants
      */
     public function allCharacters()
     {
@@ -206,6 +206,18 @@ public function allCharacters()
             ->whereIn('cr.race_id', $raceIds);
     }
 
+    /**
+     * Get all characters in the race and descendants
+     */
+    public function allCharacterRaces()
+    {
+        $raceIds = [$this->id];
+        foreach ($this->descendants as $descendant) {
+            $raceIds[] = $descendant->id;
+        };
+        return CharacterRace::groupBy('character_id')->distinct('character_id')->whereIn('race_id', $raceIds)->with('character');
+    }
+
     /**
      * Get the entity_type id from the entity_types table
      */

app/Renderers/Layouts/Race/Character.php

@@ -20,19 +20,19 @@ public function columns(): array
                 'with' => ['target' => 'character']
             ],
             'character_id' => [
-                'key' => 'name',
+                'key' => 'character.name',
                 'label' => Module::singular(config('entities.ids.character'), 'entities.character'),
                 'render' => Standard::CHARACTER,
             ],
             'type' => [
-                'key' => 'type',
+                'key' => 'character.type',
                 'label' => 'crud.fields.type',
                 'render' => function ($model) {
                     return $model->character->type;
                 },
             ],
             'location' => [
-                'key' => 'location.name',
+                'with' => 'character',
                 'label' => Module::singular(config('entities.ids.location'), 'entities.location'),
                 'render' => Standard::LOCATION,
             ],