Skip to content

Fix double-escaped apostrophe in dashboard user menu #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonhamp merged 2 commits into from
Mar 23, 2026
Merged

Fix double-escaped apostrophe in dashboard user menu #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d08f80
Fix double-escaped apostrophe in dashboard user menu
simonhamp Mar 23, 2026
396a03e
Fix test assertion to account for Flux component HTML escaping
simonhamp Mar 23, 2026
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
4 changes: 2 additions & 2 deletions resources/views/components/layouts/dashboard.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
</flux:sidebar.nav>

<flux:dropdown position="top" align="start" class="max-lg:hidden">
<flux:sidebar.profile name="{{ auth()->user()->name ?? auth()->user()->email }}" />
<flux:sidebar.profile :name="auth()->user()->name ?? auth()->user()->email" />

<flux:menu>
<flux:menu.item icon="cog-6-tooth" href="{{ route('customer.settings') }}">Settings</flux:menu.item>
Expand Down Expand Up @@ -184,7 +184,7 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
</a>

<flux:dropdown position="top" align="start">
<flux:profile name="{{ auth()->user()->name ?? auth()->user()->email }}" />
<flux:profile :name="auth()->user()->name ?? auth()->user()->email" />

<flux:menu>
<flux:menu.item icon="cog-6-tooth" href="{{ route('customer.settings') }}">Settings</flux:menu.item>
Expand Down
25 changes: 25 additions & 0 deletions tests/Feature/DashboardLayoutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace Tests\Feature;

use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class DashboardLayoutTest extends TestCase
{
use RefreshDatabase;

public function test_user_name_with_apostrophe_is_not_double_escaped_in_dashboard(): void
{
$user = User::factory()->create([
'name' => "Timmy D'Hooghe",
]);

$response = $this->withoutVite()->actingAs($user)->get('/dashboard');

$response->assertStatus(200);
$response->assertDontSee('D&amp;#039;Hooghe', false);
$response->assertSee("Timmy D'Hooghe");
}
}
Loading