Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,10 @@ public function destroy($accessoryId) : RedirectResponse
*/
public function show(Accessory $accessory) : View | RedirectResponse
{
$accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id);
$accessory->loadCount('checkouts as checkouts_count');

$accessory->load(['adminuser' => fn($query) => $query->withTrashed()]);

$this->authorize('view', $accessory);
return view('accessories.view', compact('accessory'));
}
Expand Down
24 changes: 11 additions & 13 deletions resources/views/accessories/view.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -317,20 +317,18 @@ class="table table-striped snipe-table"

@endif

<div class="row">
<div class="col-md-3" style="padding-bottom: 10px;">
<strong>
{{ trans('general.created_by') }}
</strong>
</div>
<div class="col-md-9" style="word-wrap: break-word;">
@if ($accessory->adminuser)
{{ $accessory->adminuser->present()->fullName() }}
@else
{{ trans('admin/reports/general.deleted_user') }}
@endif
@if ($accessory->adminuser)
<div class="row">
<div class="col-md-3" style="padding-bottom: 10px;">
<strong>
{{ trans('general.created_by') }}
</strong>
</div>
<div class="col-md-9" style="word-wrap: break-word;">
<x-full-user-name :user="$accessory->adminuser" />
</div>
</div>
</div>
@endif

</div>

Expand Down
27 changes: 27 additions & 0 deletions resources/views/blade/full-user-name.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@props([
'user'
])

@if($user)
@php
$fullName = $user->present()->fullName();
@endphp

@can('view', $user)
@if(! $user->trashed())
{{-- if the user is in database but soft-deleted --}}
<a href="{{ route('users.show', $user->id) }}">{{ $fullName }}</a>
@else
{{-- if the user exists --}}
<s><a href="{{ route('users.show', $user->id) }}">{{ $fullName }}</a></s>
@endif
@else
@if(! $user->trashed())
{{-- if the user is in database but soft-deleted --}}
<span>{{ $fullName }}</span>
@else
{{-- if the user exists --}}
<s><span>{{ $fullName }}</span></s>
@endif
@endcan
@endif
91 changes: 91 additions & 0 deletions tests/Unit/BladeComponents/UserFullNameTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?php

namespace Tests\Unit\BladeComponents;

use App\Models\User;
use Generator;
use Illuminate\Support\Facades\View;
use PHPUnit\Framework\Assert;
use PHPUnit\Framework\Attributes\DataProvider;
use Tests\TestCase;

class UserFullNameTest extends TestCase
{
public static function provider(): Generator
{
yield 'Renders link to user if they exist and the authenticated user can view them' => [
function () {
return [
'actor' => User::factory()->viewUsers()->create(),
'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
'assertions' => function ($rendered) {
Assert::assertStringContainsString('<a ', $rendered);
Assert::assertStringContainsString('Jim Bagg', $rendered);
},
];
}
];

yield 'Renders struck-through link to user if they are deleted and the authenticated user can view them' => [
function () {
return [
'actor' => User::factory()->viewUsers()->create(),
'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
'assertions' => function ($rendered) {
Assert::assertStringContainsString('<s><a ', $rendered);
Assert::assertStringContainsString('Jim Bagg', $rendered);
},
];
}
];

yield 'Renders name without link if the authenticated user cannot view them' => [
function () {
return [
'actor' => User::factory()->create(),
'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
'assertions' => function ($rendered) {
Assert::assertStringContainsString('<span>Jim Bagg', $rendered);
Assert::assertStringNotContainsString('<a ', $rendered);
},
];
}
];

yield 'Renders struck-through name without link if the user is deleted and the authenticated user cannot view them' => [
function () {
return [
'actor' => User::factory()->create(),
'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
'assertions' => function ($rendered) {
Assert::assertStringContainsString('<s><span>Jim Bagg', $rendered);
},
];
}
];

yield 'Renders nothing if the provided user is null' => [
function () {
return [
'actor' => User::factory()->create(),
'user' => null,
'assertions' => function ($rendered) {
Assert::assertEmpty($rendered);
},
];
}
];
}

#[DataProvider('provider')]
public function testComponent($provided)
{
['actor' => $actor, 'user' => $user, 'assertions' => $assertions] = $provided();

$this->actingAs($actor);

$renderedTemplateString = View::make('blade.full-user-name', ['user' => $user])->render();

$assertions($renderedTemplateString);
}
}
Loading