starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-09-24 23:40:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(teams): redirect team switches to the dashboard

Browse Source
This commit is contained in:
Andras Bacsai
2026-09-16 11:20:32 +02:00
parent ede9d8417a
commit d3a6cb2343
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Livewire/SwitchTeam.php
+2 -8
View File
@@ -19,7 +19,7 @@ class SwitchTeam extends Component
$this->switch_to($this->selectedTeamId);
}
public function switch_to($team_id, ?string $currentUrl = null)
public function switch_to($team_id)
{
if (! auth()->user()->teams->contains($team_id)) {
return;
@@ -30,12 +30,6 @@ class SwitchTeam extends Component
}
refreshSession($team_to_switch_to);
$parsedUrl = parse_url($currentUrl ?? '/dashboard');
$redirectUrl = data_get($parsedUrl, 'path', '/dashboard');
if ($query = data_get($parsedUrl, 'query')) {
$redirectUrl .= '?'.$query;
}
return redirect($redirectUrl);
return redirect()->route('dashboard');
}
}
resources/views/livewire/switch-team.blade.php
+2 -2
View File
@@ -22,7 +22,7 @@
Teams
</div>
@foreach (auth()->user()->teams as $team)
<button type="button" wire:click="switch_to({{ $team->id }}, window.location.href)" @click="open = false"
<button type="button" wire:click="switch_to({{ $team->id }})" @click="open = false"
class="listbox-option {{ $team->id === $currentTeam->id ? 'bg-neutral-100 font-medium dark:bg-white/[0.06]' : '' }}">
<span class="min-w-0 flex-1 truncate">{{ $team->name }}</span>
</button>
@@ -66,7 +66,7 @@
Teams
</div>
@foreach (auth()->user()->teams as $team)
<button type="button" wire:click="switch_to({{ $team->id }}, window.location.href)" @click="teamOpen = false"
<button type="button" wire:click="switch_to({{ $team->id }})" @click="teamOpen = false"
class="listbox-option {{ $team->id === $currentTeam->id ? 'bg-neutral-100 font-medium dark:bg-white/[0.06]' : '' }}">
<span class="min-w-0 flex-1 truncate">{{ $team->name }}</span>
</button>
tests/Feature/SwitchTeamTest.php
+3 -2
View File
@@ -21,12 +21,13 @@ beforeEach(function () {
session(['currentTeam' => $this->currentTeam]);
});
test('switching teams keeps the current page URL', function () {
test('switching teams always redirects to the dashboard', function () {
$currentUrl = route('security.api-tokens', ['page' => 2]);
Livewire::test(SwitchTeam::class)
->assertDontSee('window.location.href', false)
->call('switch_to', $this->otherTeam->id, $currentUrl)
->assertRedirect($currentUrl);
->assertRedirect(route('dashboard'));
expect(session('currentTeam')->is($this->otherTeam))->toBeTrue();
});