show slug in form
CI/CD / test_and_check_app (push) Failing after 55s
CI/CD / Publish immutable image (push) Skipped

This commit is contained in:
2026-09-19 02:06:54 +02:00
parent b79d93fede
commit f9958fb7cf
9 changed files with 172 additions and 60 deletions
+39 -4
View File
@@ -8,8 +8,10 @@ use App\Http\Requests\UpdateTeamRequest;
use App\Http\Resources\TeamResource; use App\Http\Resources\TeamResource;
use App\Models\Team; use App\Models\Team;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Inertia\Inertia; use Inertia\Inertia;
use Str;
class TeamController extends Controller class TeamController extends Controller
{ {
@@ -20,7 +22,6 @@ class TeamController extends Controller
{ {
return Inertia::render('team/Index', [ return Inertia::render('team/Index', [
'teams' => TeamResource::collection(Team::visibleTo(auth()->user())->get())->resolve($request), 'teams' => TeamResource::collection(Team::visibleTo(auth()->user())->get())->resolve($request),
'canCreateTeam' => auth()->user()->can('create', Team::class),
]); ]);
} }
@@ -48,10 +49,12 @@ class TeamController extends Controller
); );
}); });
Inertia::flash('success', 'Team successfully created.'); Inertia::flash('success', 'Team successfully created.');
return to_route('teams.index'); return to_route('teams.index');
} catch (\Exception $exception) { } catch (\Exception $exception) {
Inertia::flash('error', 'Team could not be created.'); Inertia::flash('error', 'Team could not be created.');
DB::rollBack(); DB::rollBack();
return back(); return back();
} }
} }
@@ -64,9 +67,11 @@ class TeamController extends Controller
/** /**
* Show the form for editing the specified resource. * Show the form for editing the specified resource.
*/ */
public function edit(Team $team) public function edit(Request $request, Team $team)
{ {
// return Inertia::render('team/Edit', [
'team' => TeamResource::make($team)->resolve($request),
]);
} }
/** /**
@@ -74,7 +79,19 @@ class TeamController extends Controller
*/ */
public function update(UpdateTeamRequest $request, Team $team) public function update(UpdateTeamRequest $request, Team $team)
{ {
// $validated = $request->validated();
try {
DB::transaction(function () use ($validated, $team) {
$team->update($validated);
});
Inertia::flash('success', 'Team successfully updated.');
} catch (\Exception $exception) {
Inertia::flash('error', 'Team could not be updated.');
DB::rollBack();
}
return to_route('teams.show', $team);
} }
/** /**
@@ -84,4 +101,22 @@ class TeamController extends Controller
{ {
// //
} }
public function nameToSlug(Request $request)
{
$validated = $request->validate([
'name' => 'required|string|max:255',
'ignored_slug' => 'nullable|string|max:255',
]);
$name = Arr::get($validated, 'name');
$slug = Str::slug($name);
$ignoredSlug = Arr::get($validated, 'ignored_slug');
return response()->json([
'name' => $name,
'slug' => $slug,
'taken' => $slug !== $ignoredSlug && Team::whereSlug($slug)->exists(),
]);
}
} }
+7 -7
View File
@@ -22,13 +22,6 @@ class StoreTeamRequest extends FormRequest
]; ];
} }
protected function prepareForValidation(): void
{
$this->merge([
'slug' => Str::slug($this->name),
]);
}
public function messages(): array public function messages(): array
{ {
return [ return [
@@ -38,4 +31,11 @@ class StoreTeamRequest extends FormRequest
'slug.unique' => 'The name has already been taken.', 'slug.unique' => 'The name has already been taken.',
]; ];
} }
protected function prepareForValidation(): void
{
$this->merge([
'slug' => Str::slug($this->name),
]);
}
} }
+11 -1
View File
@@ -17,11 +17,21 @@ class UpdateTeamRequest extends FormRequest
{ {
return [ return [
'name' => ['nullable', 'string', 'max:255'], 'name' => ['nullable', 'string', 'max:255'],
'slug' => ['nullable', 'required_if:name', 'string', 'max:255', 'unique:teams,slug,'.$this->route('team')->id], 'slug' => ['nullable', 'required_with:name', 'string', 'max:255', 'unique:teams,slug,'.$this->route('team')->id],
'require_2fa' => ['required', 'boolean'], 'require_2fa' => ['required', 'boolean'],
]; ];
} }
public function messages(): array
{
return [
'slug.string' => '',
'slug.required' => '',
'slug.max' => '',
'slug.unique' => 'The name has already been taken.',
];
}
protected function prepareForValidation(): void protected function prepareForValidation(): void
{ {
$this->merge([ $this->merge([
+53
View File
@@ -0,0 +1,53 @@
<script lang="ts" setup>
import teamRoutes from '@/routes/teams';
import InputError from "@/components/InputError.vue";
import {Label} from "@/components/ui/label";
import {Input} from "@/components/ui/input";
import {watch} from "vue";
type nameToSlugResponse = {
name: string;
slug: string;
taken: boolean;
}
const props = defineProps<{ name: string, ignoredSlug?: string }>()
const slug = defineModel<string>('slug', {
required: true,
});
const slugTaken = defineModel<boolean>('slugTaken', {
required: true,
});
const slugError = defineModel<string>('slugError', {
required: true,
});
watch(() => props.name, (newName) => fetch(teamRoutes.nameToSlug().url, {
method: 'POST',
headers: {'Content-Type': 'application/json'},
body: JSON.stringify({name: newName, ignored_slug: props.ignoredSlug})
}).then(async (response) => {
slugError.value = ''
console.info(response)
const body = (await response.json()) as unknown as nameToSlugResponse;
console.info(body)
slug.value = body.slug;
slugTaken.value = body.taken;
if (slugTaken.value) {
slugError.value = 'Der Slug ist bereits vergeben.'
}
}).catch(() => slugError.value = 'Failed to Fetch new slug')
)
</script>
<template>
<div class="grid items-start gap-3">
<Label for="slug">Slug</Label>
<Input id="slug" v-model="slug" disabled name="slug"/>
<InputError :message="slugError"/>
</div>
</template>
+14 -6
View File
@@ -1,4 +1,4 @@
<script setup lang="ts"> <script lang="ts" setup>
import teamRoutes from '@/routes/teams'; import teamRoutes from '@/routes/teams';
import {Save} from '@lucide/vue'; import {Save} from '@lucide/vue';
import {Head, useForm} from '@inertiajs/vue3'; import {Head, useForm} from '@inertiajs/vue3';
@@ -7,6 +7,8 @@ import { Input } from '@/components/ui/input';
import {Label} from '@/components/ui/label'; import {Label} from '@/components/ui/label';
import InputError from '@/components/InputError.vue'; import InputError from '@/components/InputError.vue';
import {Checkbox} from '@/components/ui/checkbox'; import {Checkbox} from '@/components/ui/checkbox';
import {ref, watch} from "vue";
import TeamSlug from "@/components/TeamSlug.vue";
defineOptions({ defineOptions({
layout: { layout: {
@@ -23,6 +25,10 @@ defineOptions({
}, },
}); });
const slug = ref('');
const slugTaken = ref(false);
const slugError = ref<string>('');
const form = useForm({ const form = useForm({
name: '', name: '',
require_2fa: false, require_2fa: false,
@@ -31,6 +37,8 @@ const form = useForm({
function submit(): void { function submit(): void {
form.submit(teamRoutes.store()); form.submit(teamRoutes.store());
} }
watch(() => (form.errors as any).slug, (newError) => slugError.value = newError)
</script> </script>
<template> <template>
@@ -38,25 +46,25 @@ function submit(): void {
<div class="flex flex-col justify-center p-16"> <div class="flex flex-col justify-center p-16">
<form class="grid w-full gap-5 py-4" @submit.prevent="submit"> <form class="grid w-full gap-5 py-4" @submit.prevent="submit">
<div class="grid grid-cols-2 gap-5"> <div class="grid grid-cols-2 gap-5 items-start">
<div class="grid items-start gap-3"> <div class="grid items-start gap-3">
<Label for="name">Name</Label> <Label for="name">Name</Label>
<Input id="name" name="name" v-model="form.name" /> <Input id="name" v-model="form.name" name="name" />
<InputError :message="form.errors.name" /> <InputError :message="form.errors.name" />
<InputError :message="(form.errors as any).slug" />
</div> </div>
<TeamSlug :name="form.name" :slug="slug" :slug-error="slugError" :slug-taken="slugTaken" />
<div class="grid items-start gap-3"> <div class="grid items-start gap-3">
<Label for="require_2fa">Require 2FA</Label> <Label for="require_2fa">Require 2FA</Label>
<Checkbox <Checkbox
id="require_2fa" id="require_2fa"
name="require_2fa"
v-model="form.require_2fa" v-model="form.require_2fa"
name="require_2fa"
/> />
<InputError :message="form.errors.require_2fa" /> <InputError :message="form.errors.require_2fa" />
</div> </div>
</div> </div>
<div class="flex w-full justify-end"> <div class="flex w-full justify-end">
<Button type="submit" class="w-fit" :disabled="form.processing"> <Button :disabled="form.processing || slugTaken" class="w-fit" type="submit">
<component :is="Save" /> <component :is="Save" />
Erstellen Erstellen
</Button> </Button>
+14 -8
View File
@@ -1,20 +1,21 @@
<script lang="ts" setup> <script lang="ts" setup>
import teamRoutes from '@/routes/teams'; import teamRoutes from '@/routes/teams';
import {Save} from '@lucide/vue'; import {Save} from '@lucide/vue';
import { Head, useForm } from '@inertiajs/vue3'; import {Head, setLayoutProps, useForm} from '@inertiajs/vue3';
import {Button} from '@/components/ui/button'; import {Button} from '@/components/ui/button';
import {Input} from '@/components/ui/input'; import {Input} from '@/components/ui/input';
import {Label} from '@/components/ui/label'; import {Label} from '@/components/ui/label';
import InputError from '@/components/InputError.vue'; import InputError from '@/components/InputError.vue';
import {Checkbox} from '@/components/ui/checkbox'; import {Checkbox} from '@/components/ui/checkbox';
import {Team} from '@/types/models'; import {Team} from '@/types/models';
import {ref, watch} from "vue";
import TeamSlug from "@/components/TeamSlug.vue";
const props = defineProps<{ const props = defineProps<{
team: Team; team: Team;
}>(); }>();
defineOptions({ setLayoutProps({
layout: {
breadcrumbs: [ breadcrumbs: [
{ {
title: 'Teams', title: 'Teams',
@@ -25,17 +26,22 @@ defineOptions({
href: teamRoutes.create(), href: teamRoutes.create(),
}, },
], ],
},
}); });
const slug = ref(props.team.slug);
const slugTaken = ref(false);
const slugError = ref<string>('');
const form = useForm({ const form = useForm({
name: props.team.name, name: props.team.name,
require_2fa: props.team.multi_factor_required, require_2fa: props.team.multi_factor_required,
}); });
function submit(): void { function submit(): void {
form.patch(teamRoutes.patch({ team: props.team.slug }).url); form.patch(teamRoutes.update({team: props.team.slug}).url);
} }
watch(() => (form.errors as any).slug, (newError) => slugError.value = newError)
</script> </script>
<template> <template>
@@ -43,13 +49,13 @@ function submit(): void {
<div class="flex flex-col justify-center p-16"> <div class="flex flex-col justify-center p-16">
<form class="grid w-full gap-5 py-4" @submit.prevent="submit"> <form class="grid w-full gap-5 py-4" @submit.prevent="submit">
<div class="grid grid-cols-2 gap-5"> <div class="grid grid-cols-2 gap-5 items-start">
<div class="grid items-start gap-3"> <div class="grid items-start gap-3">
<Label for="name">Name</Label> <Label for="name">Name</Label>
<Input id="name" v-model="form.name" name="name"/> <Input id="name" v-model="form.name" name="name"/>
<InputError :message="form.errors.name"/> <InputError :message="form.errors.name"/>
<InputError :message="(form.errors as any).slug" />
</div> </div>
<TeamSlug :ignored-slug="team.slug" :name="form.name" :slug="slug" :slug-error="slugError" :slug-taken="slugTaken" />
<div class="grid items-start gap-3"> <div class="grid items-start gap-3">
<Label for="require_2fa">Require 2FA</Label> <Label for="require_2fa">Require 2FA</Label>
<Checkbox <Checkbox
@@ -61,7 +67,7 @@ function submit(): void {
</div> </div>
</div> </div>
<div class="flex w-full justify-end"> <div class="flex w-full justify-end">
<Button :disabled="form.processing" class="w-fit" type="submit"> <Button :disabled="form.processing || slugTaken" class="w-fit" type="submit">
<component :is="Save"/> <component :is="Save"/>
Speichern Speichern
</Button> </Button>
+1 -2
View File
@@ -21,7 +21,6 @@ defineOptions({
defineProps<{ defineProps<{
teams: Team[]; teams: Team[];
canCreateTeam: boolean;
}>(); }>();
const user = usePage().props.auth.user; const user = usePage().props.auth.user;
@@ -37,7 +36,7 @@ const canManageTeam = (team: Team) =>
<Head title="Teams"/> <Head title="Teams"/>
<div class="flex flex-col justify-center p-16"> <div class="flex flex-col justify-center p-16">
<div v-if="canCreateTeam" class="flex w-full justify-end py-4"> <div class="flex w-full justify-end py-4">
<Link :href="teamRoutes.create()"> <Link :href="teamRoutes.create()">
<Button> <Button>
<component :is="Plus"/> <component :is="Plus"/>
+1 -1
View File
@@ -32,7 +32,7 @@ setLayoutProps({
<div class="flex flex-col justify-center p-16"> <div class="flex flex-col justify-center p-16">
<div v-if="canManageTeam" class="flex w-full justify-end py-4"> <div v-if="canManageTeam" class="flex w-full justify-end py-4">
<Link :href="teamRoutes.create()"> <Link :href="teamRoutes.edit({team: team.slug})">
<Button> <Button>
<component :is="Pencil"/> <component :is="Pencil"/>
Bearbeiten Bearbeiten
+4 -3
View File
@@ -10,11 +10,12 @@ Route::middleware(['auth'])->group(function () {
Route::controller(TeamController::class)->prefix('teams')->name('teams.')->group(function () { Route::controller(TeamController::class)->prefix('teams')->name('teams.')->group(function () {
Route::get('/', 'index')->name('index'); Route::get('/', 'index')->name('index');
Route::middleware('verified')->get('/create', 'create')->name('create'); Route::get('/create', 'create')->name('create');
Route::middleware('verified')->post('/', 'store')->name('store'); Route::post('/', 'store')->name('store');
Route::get('/{team:slug}', 'show')->name('show'); Route::get('/{team:slug}', 'show')->name('show');
Route::get('/edit/{team:slug}', 'edit')->name('edit'); Route::get('/edit/{team:slug}', 'edit')->name('edit');
Route::patch('/{team:slug}', 'patch')->name('patch'); Route::patch('/{team:slug}', 'update')->name('update');
Route::post('/name-to-slug', 'nameToSlug')->name('nameToSlug');
}); });
}); });