add team delte
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Enums;
|
||||
|
||||
enum TeamMemberRole: string
|
||||
{
|
||||
case Owner = 'owner';
|
||||
case Admin = 'admin';
|
||||
case Member = 'member';
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ class TeamController extends Controller
|
||||
try {
|
||||
DB::transaction(function () use ($request): void {
|
||||
$team = Team::create($request->validated());
|
||||
$team->members()->attach($request->user(), ['role' => TeamMemberRole::Admin]);
|
||||
$team->members()->attach($request->user(), ['role' => TeamMemberRole::Owner]);
|
||||
});
|
||||
} catch (\Exception $exception) {
|
||||
report($exception);
|
||||
@@ -100,6 +100,17 @@ class TeamController extends Controller
|
||||
|
||||
return to_route('teams.show', $team);
|
||||
}
|
||||
public function destroy(Request $request, Team $team)
|
||||
{
|
||||
try {
|
||||
$team->delete();
|
||||
} catch (\Exception $exception) {
|
||||
report($exception);
|
||||
Inertia::flash('error', 'Team could not be deleted.');
|
||||
}
|
||||
|
||||
Inertia::flash('success', 'Team successfully deleted.');
|
||||
}
|
||||
|
||||
public function nameToSlug(Request $request): JsonResponse
|
||||
{
|
||||
|
||||
@@ -28,6 +28,16 @@ class TeamPolicy
|
||||
return false;
|
||||
}
|
||||
|
||||
return $membership->pivot->role === TeamMemberRole::Admin;
|
||||
return ($membership->pivot->role === TeamMemberRole::Admin) || ($membership->pivot->role === TeamMemberRole::Owner);
|
||||
}
|
||||
|
||||
public function delete(User $user, Team $team): bool
|
||||
{
|
||||
$membership = $team->members()->whereKey($user->id)->first();
|
||||
if (! $membership) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $membership->pivot->role === TeamMemberRole::Owner;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,17 +4,9 @@ import { Head, Link, router, usePage } from '@inertiajs/vue3';
|
||||
import type {Team} from '@/types/models';
|
||||
import TextLink from '@/components/TextLink.vue';
|
||||
import {Card, CardContent} from '@/components/ui/card';
|
||||
import {
|
||||
Table,
|
||||
TableBody,
|
||||
TableCaption,
|
||||
TableCell,
|
||||
TableHead,
|
||||
TableHeader,
|
||||
TableRow,
|
||||
} from '@/components/ui/table';
|
||||
import {Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow,} from '@/components/ui/table';
|
||||
import {Button} from '@/components/ui/button';
|
||||
import { Eye, Pencil, Plus } from '@lucide/vue';
|
||||
import {Eye, Pencil, Plus, Trash} from '@lucide/vue';
|
||||
|
||||
defineOptions({
|
||||
layout: {
|
||||
@@ -38,6 +30,9 @@ const openTeam = (team: Team) =>
|
||||
|
||||
const canManageTeam = (team: Team) =>
|
||||
team.members.find((member) => member.email === user.email)?.role === 'admin';
|
||||
|
||||
const canDeleteTeam = (team: Team) =>
|
||||
team.members.find((member) => member.email === user.email)?.role === 'owner';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -61,6 +56,7 @@ const canManageTeam = (team: Team) =>
|
||||
<TableHead>Slug</TableHead>
|
||||
<TableHead>Mitglieder</TableHead>
|
||||
<TableHead>2FA</TableHead>
|
||||
<TableHead/>
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
@@ -78,7 +74,7 @@ const canManageTeam = (team: Team) =>
|
||||
<TableCell>{{
|
||||
team.multi_factor_required ? 'Ja' : 'Nein'
|
||||
}}</TableCell>
|
||||
<TableCell>
|
||||
<TableCell class="flex gap-4 justify-end">
|
||||
<Link
|
||||
:href="
|
||||
(canManageTeam(team) ? teamRoutes.edit : teamRoutes.show)({
|
||||
@@ -93,6 +89,21 @@ const canManageTeam = (team: Team) =>
|
||||
size="18"
|
||||
/>
|
||||
</Link>
|
||||
<Link
|
||||
v-if="canDeleteTeam(team)"
|
||||
:href="
|
||||
teamRoutes.destroy({
|
||||
team: team.slug,
|
||||
})
|
||||
"
|
||||
class="cursor-pointer text-red-500"
|
||||
@click.stop
|
||||
>
|
||||
<component
|
||||
:is="Trash"
|
||||
size="18"
|
||||
/>
|
||||
</Link>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableBody>
|
||||
|
||||
@@ -6,7 +6,10 @@ export interface Team {
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export type TeamMemberRole = 'admin' | 'member';
|
||||
export type TeamMemberRole =
|
||||
|'owner'
|
||||
| 'admin'
|
||||
| 'member';
|
||||
|
||||
export interface User {
|
||||
name: string;
|
||||
|
||||
@@ -25,6 +25,7 @@ Route::middleware(['auth'])->group(function () {
|
||||
Route::patch('/{team:slug}', 'update')->name('update')->can('manage', 'team');
|
||||
Route::post('/name-to-slug', 'nameToSlug')->name('nameToSlug');
|
||||
Route::get('/{team:slug}', 'show')->name('show')->can('view', 'team');
|
||||
Route::delete('/{team:slug}', 'destroy')->name('destroy')->can('delete', 'team');
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
@@ -65,7 +65,7 @@ test('unverified users cannot create teams', function (string $method, string $r
|
||||
$this->assertDatabaseCount('teams', 0);
|
||||
})->with([['get', 'teams.create'], ['post', 'teams.store']]);
|
||||
|
||||
test('team creation derives the slug and adds its creator as admin', function () {
|
||||
test('team creation derives the slug and adds its creator as owner', function () {
|
||||
$user = User::factory()->create();
|
||||
|
||||
$this->actingAs($user)->post(route('teams.store'), [
|
||||
@@ -73,7 +73,7 @@ test('team creation derives the slug and adds its creator as admin', function ()
|
||||
])->assertSessionHasNoErrors()->assertRedirect(route('teams.index'));
|
||||
|
||||
$this->assertDatabaseHas('teams', ['name' => 'Test Team', 'slug' => 'test-team', 'require_2fa' => true]);
|
||||
$this->assertDatabaseHas('team_members', ['user_id' => $user->id, 'role' => 'admin']);
|
||||
$this->assertDatabaseHas('team_members', ['user_id' => $user->id, 'role' => 'owner']);
|
||||
$this->assertDatabaseMissing('teams', ['id' => 999]);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user