Add checklist acceptance criteria

resources/js/lib/acceptance-criteria.ts

@@ -0,0 +1,146 @@
+import type {
+    AcceptanceCriteriaItemModel,
+    AcceptanceCriteriaModel,
+} from '@/types/models/acceptance-criteria-model';
+
+const MAX_INDENT_LEVEL = 8;
+
+export type AcceptanceCriteriaEditorState = {
+    checklist: string;
+    summary: string;
+};
+
+export const emptyAcceptanceCriteria = (): AcceptanceCriteriaModel => ({
+    summary: null,
+    items: [],
+});
+
+export const normalizeAcceptanceCriteria = (
+    value: AcceptanceCriteriaModel | null | undefined,
+): AcceptanceCriteriaModel => {
+    if (value === null || value === undefined) {
+        return emptyAcceptanceCriteria();
+    }
+
+    const summary = value.summary?.trim() ?? null;
+    const items = Array.isArray(value.items)
+        ? value.items
+              .map((item) => ({
+                  checked: item.checked === true,
+                  indent: clampIndent(item.indent),
+                  text: item.text.trim(),
+              }))
+              .filter((item) => item.text !== '')
+        : [];
+
+    return {
+        summary: summary === '' ? null : summary,
+        items,
+    };
+};
+
+export const parseChecklistLines = (
+    checklistInput: string,
+): AcceptanceCriteriaItemModel[] => {
+    if (checklistInput.trim() === '') {
+        return [];
+    }
+
+    return checklistInput
+        .split(/\r?\n/u)
+        .map((line) => parseChecklistLine(line))
+        .filter(
+            (parsedLine): parsedLine is AcceptanceCriteriaItemModel =>
+                parsedLine !== null,
+        );
+};
+
+export const formatChecklistLines = (
+    items: AcceptanceCriteriaItemModel[],
+): string => {
+    return items
+        .map((item) => {
+            const indentation = '  '.repeat(clampIndent(item.indent));
+            const marker = item.checked ? '[x]' : '[ ]';
+
+            return `${indentation}${marker} ${item.text}`;
+        })
+        .join('\n');
+};
+
+export const buildAcceptanceCriteria = (
+    summaryInput: string,
+    checklistInput: string,
+): AcceptanceCriteriaModel => {
+    const summary = summaryInput.trim();
+
+    return normalizeAcceptanceCriteria({
+        summary: summary === '' ? null : summary,
+        items: parseChecklistLines(checklistInput),
+    });
+};
+
+export const acceptanceCriteriaToEditorState = (
+    value: AcceptanceCriteriaModel | null | undefined,
+): AcceptanceCriteriaEditorState => {
+    const normalized = normalizeAcceptanceCriteria(value);
+
+    return {
+        checklist: formatChecklistLines(normalized.items),
+        summary: normalized.summary ?? '',
+    };
+};
+
+const parseChecklistLine = (
+    line: string,
+): AcceptanceCriteriaItemModel | null => {
+    const normalizedLine = line.replaceAll('\t', '  ').trimEnd();
+
+    if (normalizedLine.trim() === '') {
+        return null;
+    }
+
+    const match = /^(?<indent>\s*)(?<content>.+)$/u.exec(normalizedLine);
+
+    if (match === null || match.groups === undefined) {
+        return null;
+    }
+
+    const indentLevel = clampIndent(
+        Math.floor(match.groups.indent.length / 2),
+    );
+    let content = match.groups.content.trim();
+    let checked = false;
+
+    const checkboxMatch =
+        /^(?:[-*+]\s+)?\[(?<state>[xX ])\]\s*(?<text>.+)$/u.exec(content);
+
+    if (checkboxMatch?.groups !== undefined) {
+        checked = checkboxMatch.groups.state.toLowerCase() === 'x';
+        content = checkboxMatch.groups.text.trim();
+    } else {
+        const bulletMatch = /^[-*+]\s+(?<text>.+)$/u.exec(content);
+
+        if (bulletMatch?.groups !== undefined) {
+            content = bulletMatch.groups.text.trim();
+        }
+    }
+
+    if (content === '') {
+        return null;
+    }
+
+    return {
+        checked,
+        indent: indentLevel,
+        text: content,
+    };
+};
+
+const clampIndent = (indent: number): number => {
+    if (!Number.isFinite(indent)) {
+        return 0;
+    }
+
+    return Math.max(0, Math.min(MAX_INDENT_LEVEL, Math.trunc(indent)));
+};

resources/js/pages/projects/Ticket.vue

@@ -2,6 +2,11 @@
 import { Form, useForm, Head, Link, usePage } from '@inertiajs/vue3';
 import { CheckCircle2, GitBranchPlus, XCircle } from 'lucide-vue-next';
 import { computed, ref, watch } from 'vue';
+import {
+    acceptanceCriteriaToEditorState,
+    buildAcceptanceCriteria,
+    parseChecklistLines,
+} from '@/lib/acceptance-criteria';
 import ProjectTicketBranchController from '@/actions/App/Http/Controllers/ProjectTicketBranchController';
 import ProjectTicketLinkController from '@/actions/App/Http/Controllers/ProjectTicketLinkController';
 import ProjectTicketController from '@/actions/App/Http/Controllers/ProjectTicketController';
@@ -103,8 +108,17 @@ const breadcrumbs: BreadcrumbItem[] = [
     },
 ];
 
+const acceptanceCriteriaEditorState = acceptanceCriteriaToEditorState(
+    props.ticket.acceptance_criteria,
+);
+const acceptanceCriteriaSummary = ref(acceptanceCriteriaEditorState.summary);
+const acceptanceCriteriaChecklist = ref(acceptanceCriteriaEditorState.checklist);
+
 const form = useForm({
-    acceptance_criteria: props.ticket.acceptance_criteria ?? '',
+    acceptance_criteria: buildAcceptanceCriteria(
+        acceptanceCriteriaSummary.value,
+        acceptanceCriteriaChecklist.value,
+    ),
     assignee_user_id: props.ticket.assignee_user_id ?? '',
     author_user_id: props.ticket.author_user_id ?? '',
     blocked_comment: props.ticket.blocked_comment ?? '',
@@ -130,6 +144,22 @@ const form = useForm({
     story_points: props.ticket.story_points,
 });
 
+const acceptanceCriteriaPreviewItems = computed(() =>
+    parseChecklistLines(acceptanceCriteriaChecklist.value),
+);
+
+const acceptanceCriteriaError = computed(() => {
+    return (
+        form.errors.acceptance_criteria ??
+        form.errors['acceptance_criteria.summary'] ??
+        form.errors['acceptance_criteria.items'] ??
+        Object.entries(form.errors).find(([key]) =>
+            key.startsWith('acceptance_criteria.items.'),
+        )?.[1] ??
+        ''
+    );
+});
+
 const isCreateBranchDialogOpen = ref(false);
 const isCheckingBranchName = ref(false);
 const branchNameValidation = ref<BranchNameValidationModel | null>(null);
@@ -318,6 +348,11 @@ const submit = (): void => {
         return;
     }
 
+    form.acceptance_criteria = buildAcceptanceCriteria(
+        acceptanceCriteriaSummary.value,
+        acceptanceCriteriaChecklist.value,
+    );
+
     form.submit(
         ProjectTicketController.update({
             project: props.project.id,
@@ -589,22 +624,64 @@ const formatDateTime = (value: string): string => {
                                 />
                             </div>
 
-                            <div class="grid gap-2">
-                                <Label for="acceptance_criteria">
-                                    Acceptance criteria
-                                </Label>
-                                <textarea
-                                    id="acceptance_criteria"
-                                    v-model="form.acceptance_criteria"
-                                    rows="5"
-                                    :disabled="
-                                        !canEditTicket || form.processing
-                                    "
-                                    class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
-                                />
-                                <InputError
-                                    :message="form.errors.acceptance_criteria"
-                                />
+                            <div class="grid gap-4">
+                                <div class="grid gap-2">
+                                    <Label for="acceptance_criteria_summary">
+                                        Acceptance criteria summary
+                                    </Label>
+                                    <Input
+                                        id="acceptance_criteria_summary"
+                                        v-model="acceptanceCriteriaSummary"
+                                        :disabled="
+                                            !canEditTicket || form.processing
+                                        "
+                                        placeholder="What should be true when this ticket is done?"
+                                    />
+                                </div>
+
+                                <div class="grid gap-2">
+                                    <Label for="acceptance_criteria_checklist">
+                                        Acceptance criteria checklist
+                                    </Label>
+                                    <textarea
+                                        id="acceptance_criteria_checklist"
+                                        v-model="acceptanceCriteriaChecklist"
+                                        rows="5"
+                                        :disabled="
+                                            !canEditTicket || form.processing
+                                        "
+                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
+                                        placeholder="[ ] User can sign in&#10;  [x] Validation is shown for invalid credentials"
+                                    />
+                                    <p class="text-muted-foreground text-xs">
+                                        Use <code>[ ]</code> / <code>[x]</code> for checklist items. Indent with two spaces for nested steps.
+                                    </p>
+                                    <InputError
+                                        :message="acceptanceCriteriaError"
+                                    />
+                                </div>
+
+                                <div
+                                    v-if="acceptanceCriteriaPreviewItems.length > 0"
+                                    class="border-border rounded-xl border p-4 text-sm"
+                                >
+                                    <p class="mb-3 font-medium">
+                                        Checklist preview
+                                    </p>
+                                    <ul class="space-y-2">
+                                        <li
+                                            v-for="(item, index) in acceptanceCriteriaPreviewItems"
+                                            :key="index"
+                                            :style="{
+                                                marginLeft: `${item.indent * 1.25}rem`,
+                                            }"
+                                            class="flex items-start gap-2"
+                                        >
+                                            <span class="mt-0.5">{{ item.checked ? '☑' : '☐' }}</span>
+                                            <span>{{ item.text }}</span>
+                                        </li>
+                                    </ul>
+                                </div>
                             </div>
 
                             <div

resources/js/pages/projects/TicketCreate.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { Form, Head, Link } from '@inertiajs/vue3';
+import { Head, Link, useForm } from '@inertiajs/vue3';
+import { computed, ref } from 'vue';
 import ProjectTicketController from '@/actions/App/Http/Controllers/ProjectTicketController';
 import Heading from '@/components/Heading.vue';
 import InputError from '@/components/InputError.vue';
@@ -15,6 +16,10 @@ import {
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import AppLayout from '@/layouts/AppLayout.vue';
+import {
+    buildAcceptanceCriteria,
+    parseChecklistLines,
+} from '@/lib/acceptance-criteria';
 import { index as backlogIndex } from '@/routes/projects/backlog';
 import { index as boardIndex } from '@/routes/projects/board';
 import { index, show } from '@/routes/projects/index';
@@ -56,6 +61,52 @@ const hasTicketMetadata =
     props.ticketPriorities.length > 0 &&
     props.ticketStatusOptions.length > 0;
 
+const acceptanceCriteriaSummary = ref('');
+const acceptanceCriteriaChecklist = ref('');
+
+const form = useForm({
+    acceptance_criteria: buildAcceptanceCriteria(
+        acceptanceCriteriaSummary.value,
+        acceptanceCriteriaChecklist.value,
+    ),
+    assignee_user_id: '',
+    description: '',
+    story_points: '',
+    ticket_priority_id: String(props.ticketPriorities[0]?.id ?? ''),
+    ticket_status_id: String(
+        props.defaultTicketStatusId ?? props.ticketStatusOptions[0]?.id ?? '',
+    ),
+    ticket_type_id: String(props.ticketTypes[0]?.id ?? ''),
+    title: '',
+});
+
+const acceptanceCriteriaPreviewItems = computed(() =>
+    parseChecklistLines(acceptanceCriteriaChecklist.value),
+);
+
+const acceptanceCriteriaError = computed(() => {
+    return (
+        form.errors.acceptance_criteria ??
+        form.errors['acceptance_criteria.summary'] ??
+        form.errors['acceptance_criteria.items'] ??
+        Object.entries(form.errors).find(([key]) =>
+            key.startsWith('acceptance_criteria.items.'),
+        )?.[1] ??
+        ''
+    );
+});
+
+const submit = (): void => {
+    form.acceptance_criteria = buildAcceptanceCriteria(
+        acceptanceCriteriaSummary.value,
+        acceptanceCriteriaChecklist.value,
+    );
+
+    form.submit(ProjectTicketController.store({ project: props.project.id }), {
+        preserveScroll: true,
+    });
+};
+
 const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
     if (
         ticketStatus.board_column === null ||
@@ -116,21 +167,18 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                 </CardHeader>
 
                 <CardContent>
-                    <Form
-                        v-bind="ProjectTicketController.store.form(project.id)"
-                        class="grid gap-6"
-                        v-slot="{ errors, processing }"
-                    >
+                    <form class="grid gap-6" @submit.prevent="submit">
                         <div class="grid gap-2">
                             <Label for="title">Title</Label>
                             <Input
                                 id="title"
-                                name="title"
+                                v-model="form.title"
                                 required
                                 autofocus
+                                :disabled="form.processing"
                                 placeholder="Implement repository sync"
                             />
-                            <InputError :message="errors.title" />
+                            <InputError :message="form.errors.title" />
                         </div>
 
                         <div class="grid gap-6 lg:grid-cols-[minmax(0,1fr)_20rem]">
@@ -139,28 +187,67 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                                     <Label for="description">Description</Label>
                                     <textarea
                                         id="description"
-                                        name="description"
+                                        v-model="form.description"
                                         rows="4"
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                                        :disabled="form.processing"
+                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
                                         placeholder="Describe the expected behavior and relevant context."
                                     />
-                                    <InputError :message="errors.description" />
+                                    <InputError :message="form.errors.description" />
                                 </div>
 
-                                <div class="grid gap-2">
-                                    <Label for="acceptance_criteria">
-                                        Acceptance criteria
-                                    </Label>
-                                    <textarea
-                                        id="acceptance_criteria"
-                                        name="acceptance_criteria"
-                                        rows="4"
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
-                                        placeholder="List the conditions that must be true before this ticket is done."
-                                    />
-                                    <InputError
-                                        :message="errors.acceptance_criteria"
-                                    />
+                                <div class="grid gap-4">
+                                    <div class="grid gap-2">
+                                        <Label for="acceptance_criteria_summary">
+                                            Acceptance criteria summary
+                                        </Label>
+                                        <Input
+                                            id="acceptance_criteria_summary"
+                                            v-model="acceptanceCriteriaSummary"
+                                            :disabled="form.processing"
+                                            placeholder="What should be true when this ticket is done?"
+                                        />
+                                    </div>
+
+                                    <div class="grid gap-2">
+                                        <Label for="acceptance_criteria_checklist">
+                                            Acceptance criteria checklist
+                                        </Label>
+                                        <textarea
+                                            id="acceptance_criteria_checklist"
+                                            v-model="acceptanceCriteriaChecklist"
+                                            rows="6"
+                                            :disabled="form.processing"
+                                            class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
+                                            placeholder="[ ] User can sign in&#10;  [x] Validation is shown for invalid credentials"
+                                        />
+                                        <p class="text-muted-foreground text-xs">
+                                            Use <code>[ ]</code> / <code>[x]</code> for checklist items. Indent with two spaces for nested steps.
+                                        </p>
+                                        <InputError :message="acceptanceCriteriaError" />
+                                    </div>
+
+                                    <div
+                                        v-if="acceptanceCriteriaPreviewItems.length > 0"
+                                        class="border-border rounded-xl border p-4 text-sm"
+                                    >
+                                        <p class="mb-3 font-medium">
+                                            Checklist preview
+                                        </p>
+                                        <ul class="space-y-2">
+                                            <li
+                                                v-for="(item, index) in acceptanceCriteriaPreviewItems"
+                                                :key="index"
+                                                :style="{
+                                                    marginLeft: `${item.indent * 1.25}rem`,
+                                                }"
+                                                class="flex items-start gap-2"
+                                            >
+                                                <span class="mt-0.5">{{ item.checked ? '☑' : '☐' }}</span>
+                                                <span>{{ item.text }}</span>
+                                            </li>
+                                        </ul>
+                                    </div>
                                 </div>
                             </div>
 
@@ -169,20 +256,19 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                                     <Label for="ticket_type_id">Type</Label>
                                     <select
                                         id="ticket_type_id"
-                                        name="ticket_type_id"
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                                        v-model="form.ticket_type_id"
+                                        :disabled="form.processing"
+                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
                                     >
                                         <option
                                             v-for="ticketType in ticketTypes"
                                             :key="ticketType.id"
-                                            :value="ticketType.id"
+                                            :value="String(ticketType.id)"
                                         >
                                             {{ ticketType.name }}
                                         </option>
                                     </select>
-                                    <InputError
-                                        :message="errors.ticket_type_id"
-                                    />
+                                    <InputError :message="form.errors.ticket_type_id" />
                                 </div>
 
                                 <div class="grid gap-2">
@@ -191,44 +277,38 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                                     </Label>
                                     <select
                                         id="ticket_priority_id"
-                                        name="ticket_priority_id"
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                                        v-model="form.ticket_priority_id"
+                                        :disabled="form.processing"
+                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
                                     >
                                         <option
                                             v-for="ticketPriority in ticketPriorities"
                                             :key="ticketPriority.id"
-                                            :value="ticketPriority.id"
+                                            :value="String(ticketPriority.id)"
                                         >
                                             {{ ticketPriority.name }}
                                         </option>
                                     </select>
-                                    <InputError
-                                        :message="errors.ticket_priority_id"
-                                    />
+                                    <InputError :message="form.errors.ticket_priority_id" />
                                 </div>
 
                                 <div class="grid gap-2">
                                     <Label for="ticket_status_id">Status</Label>
                                     <select
                                         id="ticket_status_id"
-                                        name="ticket_status_id"
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                                        v-model="form.ticket_status_id"
+                                        :disabled="form.processing"
+                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
                                     >
                                         <option
                                             v-for="ticketStatus in ticketStatusOptions"
                                             :key="ticketStatus.id"
-                                            :value="ticketStatus.id"
-                                            :selected="
-                                                ticketStatus.id ===
-                                                defaultTicketStatusId
-                                            "
+                                            :value="String(ticketStatus.id)"
                                         >
                                             {{ ticketStatusLabel(ticketStatus) }}
                                         </option>
                                     </select>
-                                    <InputError
-                                        :message="errors.ticket_status_id"
-                                    />
+                                    <InputError :message="form.errors.ticket_status_id" />
                                 </div>
 
                                 <div class="grid gap-2">
@@ -237,21 +317,20 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                                     </Label>
                                     <select
                                         id="assignee_user_id"
-                                        name="assignee_user_id"
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                                        v-model="form.assignee_user_id"
+                                        :disabled="form.processing"
+                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-60"
                                     >
                                         <option value="">Unassigned</option>
                                         <option
                                             v-for="user in users"
                                             :key="user.id"
-                                            :value="user.id"
+                                            :value="String(user.id)"
                                         >
                                             {{ user.name }}
                                         </option>
                                     </select>
-                                    <InputError
-                                        :message="errors.assignee_user_id"
-                                    />
+                                    <InputError :message="form.errors.assignee_user_id" />
                                 </div>
 
                                 <div
@@ -263,19 +342,18 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                                     </Label>
                                     <Input
                                         id="story_points"
-                                        name="story_points"
+                                        v-model="form.story_points"
                                         type="number"
                                         step="1"
+                                        :disabled="form.processing"
                                     />
-                                    <InputError
-                                        :message="errors.story_points"
-                                    />
+                                    <InputError :message="form.errors.story_points" />
                                 </div>
                             </div>
                         </div>
 
                         <div class="flex flex-wrap items-center gap-3">
-                            <Button type="submit" :disabled="processing">
+                            <Button type="submit" :disabled="form.processing">
                                 Create ticket
                             </Button>
                             <Button as-child variant="outline">
@@ -284,7 +362,7 @@ const ticketStatusLabel = (ticketStatus: TicketStatusModel): string => {
                                 </Link>
                             </Button>
                         </div>
-                    </Form>
+                    </form>
                 </CardContent>
             </Card>
 

resources/js/types/models/acceptance-criteria-model.ts

@@ -0,0 +1,10 @@
+export type AcceptanceCriteriaItemModel = {
+    checked: boolean;
+    indent: number;
+    text: string;
+};
+
+export type AcceptanceCriteriaModel = {
+    summary: string | null;
+    items: AcceptanceCriteriaItemModel[];
+};

resources/js/types/models/ticket-model.ts

@@ -1,3 +1,4 @@
+import type { AcceptanceCriteriaModel } from '@/types/models/acceptance-criteria-model';
 import type { TicketFieldValueModel } from '@/types/models/ticket-field-value-model';
 import type { TicketPriorityModel } from '@/types/models/ticket-priority-model';
 import type { TicketStatusModel } from '@/types/models/ticket-status-model';
@@ -7,7 +8,8 @@ import type { UserModel } from '@/types/models/user-model';
 
 export type TicketModel = {
     id: number;
-    acceptance_criteria: string | null;
+    acceptance_criteria: AcceptanceCriteriaModel;
+    acceptance_criteria_text: string | null;
     assignee: UserModel | null;
     assignee_user_id: number | null;
     author: UserModel | null;