+ @class([
+ 'data-table-row team-members-table-grid border-b border-neutral-200 last:border-b-0 dark:border-white/[0.07]',
+ 'team-members-table-grid-2fa' => auth()->user()?->can('manageMembers', currentTeam()),
+ ])>
+ @can('manageMembers', currentTeam())
+
+
+
+ @endcan
@can('manageMembers', currentTeam())
@if ($member->id !== Auth::id())
diff --git a/resources/views/livewire/team/member/index.blade.php b/resources/views/livewire/team/member/index.blade.php
index cb32f4517..b2ad88710 100644
--- a/resources/views/livewire/team/member/index.blade.php
+++ b/resources/views/livewire/team/member/index.blade.php
@@ -4,7 +4,7 @@
sortBy: 'name_asc',
page: 1,
perPage: 10,
- members: @js(currentTeam()->members->map(fn ($member) => [
+ members: @js($members->map(fn ($member) => [
'id' => $member->id,
'name' => $member->name,
'email' => $member->email,
@@ -95,14 +95,31 @@
+ @can('manageMembers', currentTeam())
+
+ @if ($membersWithoutTwoFactorCount > 0)
+ {{ $membersWithoutTwoFactorCount }} of {{ $members->count() }} {{ Str::plural('member', $members->count()) }} {{ $membersWithoutTwoFactorCount === 1 ? 'does' : 'do' }} not have two-factor authentication enabled.
+ @else
+ All members have two-factor authentication enabled.
+ @endif
+
+ @endcan
+
-
diff --git a/tests/Feature/TeamMemberTwoFactorStatusTest.php b/tests/Feature/TeamMemberTwoFactorStatusTest.php
new file mode 100644
index 000000000..0caaf4207
--- /dev/null
+++ b/tests/Feature/TeamMemberTwoFactorStatusTest.php
@@ -0,0 +1,144 @@
+ InstanceSettings::query()->create([
+ 'id' => 0,
+ ]));
+
+ $this->team = Team::factory()->create();
+});
+
+function createTeamMember(Team $team, string $role, bool $twoFactorEnabled = false): User
+{
+ $user = User::factory()->create([
+ 'name' => fake()->unique()->userName(),
+ 'two_factor_confirmed_at' => $twoFactorEnabled ? now() : null,
+ ]);
+
+ $team->members()->attach($user->id, ['role' => $role]);
+
+ return $user;
+}
+
+function actAsTeamMember(User $user, Team $team): void
+{
+ test()->actingAs($user);
+ session(['currentTeam' => $team]);
+}
+
+test('admins see the two factor column with the status of every member', function () {
+ $admin = createTeamMember($this->team, 'admin', twoFactorEnabled: true);
+ createTeamMember($this->team, 'member');
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Index::class)
+ ->assertSee('2FA')
+ ->assertSee('Two-factor authentication is enabled')
+ ->assertSee('Two-factor authentication is disabled');
+});
+
+test('owners see the two factor column and summary', function () {
+ $owner = createTeamMember($this->team, 'owner', twoFactorEnabled: true);
+ createTeamMember($this->team, 'member');
+
+ actAsTeamMember($owner, $this->team);
+
+ Livewire::test(Index::class)
+ ->assertSee('2FA')
+ ->assertSee('1 of 2 members does not have two-factor authentication enabled');
+});
+
+test('members without member management rights do not see the two factor column', function () {
+ createTeamMember($this->team, 'owner', twoFactorEnabled: true);
+ $member = createTeamMember($this->team, 'member');
+
+ actAsTeamMember($member, $this->team);
+
+ Livewire::test(Index::class)
+ ->assertDontSee('2FA')
+ ->assertDontSee('Two-factor authentication is enabled')
+ ->assertDontSee('Two-factor authentication is disabled')
+ ->assertDontSee('two-factor authentication enabled');
+});
+
+test('the member row renders an enabled badge when two factor is confirmed', function () {
+ $admin = createTeamMember($this->team, 'admin');
+ $memberWithTwoFactor = createTeamMember($this->team, 'member', twoFactorEnabled: true);
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Member::class, ['member' => $memberWithTwoFactor])
+ ->assertSee('Two-factor authentication is enabled')
+ ->assertDontSee('Two-factor authentication is disabled');
+});
+
+test('the member row renders a disabled badge when two factor is not configured', function () {
+ $admin = createTeamMember($this->team, 'admin');
+ $memberWithoutTwoFactor = createTeamMember($this->team, 'member');
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Member::class, ['member' => $memberWithoutTwoFactor])
+ ->assertSee('Two-factor authentication is disabled')
+ ->assertDontSee('Two-factor authentication is enabled');
+});
+
+test('admins see the two factor status of every role, including owners and other admins', function (string $role, bool $twoFactorEnabled, string $expectedStatus) {
+ $admin = createTeamMember($this->team, 'admin');
+ $otherMember = createTeamMember($this->team, $role, twoFactorEnabled: $twoFactorEnabled);
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Member::class, ['member' => $otherMember])
+ ->assertSee($expectedStatus);
+})->with([
+ 'owner with two factor' => ['owner', true, 'Two-factor authentication is enabled'],
+ 'owner without two factor' => ['owner', false, 'Two-factor authentication is disabled'],
+ 'another admin with two factor' => ['admin', true, 'Two-factor authentication is enabled'],
+ 'another admin without two factor' => ['admin', false, 'Two-factor authentication is disabled'],
+ 'member with two factor' => ['member', true, 'Two-factor authentication is enabled'],
+ 'member without two factor' => ['member', false, 'Two-factor authentication is disabled'],
+]);
+
+test('admins see the two factor status on their own row', function () {
+ $admin = createTeamMember($this->team, 'admin', twoFactorEnabled: true);
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Member::class, ['member' => $admin])
+ ->assertSee('You')
+ ->assertSee('Two-factor authentication is enabled');
+});
+
+test('the summary counts the members that are missing two factor authentication', function () {
+ $admin = createTeamMember($this->team, 'admin', twoFactorEnabled: true);
+ createTeamMember($this->team, 'member');
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Index::class)
+ ->assertSee('1 of 2')
+ ->assertSee('does not have two-factor authentication enabled');
+});
+
+test('the summary confirms when every member has two factor authentication', function () {
+ $admin = createTeamMember($this->team, 'admin', twoFactorEnabled: true);
+ createTeamMember($this->team, 'member', twoFactorEnabled: true);
+
+ actAsTeamMember($admin, $this->team);
+
+ Livewire::test(Index::class)
+ ->assertSee('All members have two-factor authentication enabled')
+ ->assertDontSee('do not have two-factor authentication enabled');
+});
From 8264129f031d301e74d90e06945f1db3faedce2c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Wed, 12 Aug 2026 11:32:00 +0200
Subject: [PATCH 09/10] fix(ui): raise top bar above open service actions
---
resources/views/layouts/app.blade.php | 3 +++
.../views/livewire/project/service/heading.blade.php | 1 +
tests/Feature/ResourceHeadingUnifiedNavbarTest.php | 12 ++++++++++++
3 files changed, 16 insertions(+)
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 1c8e91dca..43f5dff42 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -27,6 +27,9 @@
{{-- ============ DESKTOP TOP BAR ============ --}}
{{-- Brand (width tracks sidebar) --}}