From daeeb3eb524b2a2afaf574ef197b70af87c3deac Mon Sep 17 00:00:00 2001
From: Yoga Pangestu <ypangestu976@gmail.com>
Date: Mon, 31 Aug 2026 15:37:18 +0700
Subject: [PATCH] feat: refactor feedback service methods and enhance feedback
 user details in UI

---
 app/Services/Admin/FeedbackService.php        | 24 +++++++++----------
 resources/js/pages/admin/feedback/columns.tsx | 14 +++++------
 resources/js/pages/admin/feedback/index.tsx   | 11 +++++++--
 resources/js/types/feedback.ts                |  7 ++++++
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/app/Services/Admin/FeedbackService.php b/app/Services/Admin/FeedbackService.php
index 2f5e33e..1a9de84 100644
--- a/app/Services/Admin/FeedbackService.php
+++ b/app/Services/Admin/FeedbackService.php
@@ -41,18 +41,6 @@ public function __construct()
         $this->sanitizer = new HtmlSanitizer($config);
     }
 
-    public function paginated(User $user, int $perPage = 25, string $search = '', ?string $type = null, ?string $status = null): LengthAwarePaginator
-    {
-        return Feedback::query()
-            ->where('user_id', $user->id)
-            ->with('handler.profile')
-            ->when($search, fn($q) => $q->where('subject', 'like', "%{$search}%"))
-            ->when($type, fn($q) => $q->where('type', $type))
-            ->when($status, fn($q) => $q->where('status', $status))
-            ->latest()
-            ->paginate($perPage);
-    }
-
     public function pendingCount(User $user): int
     {
         return Feedback::query()
@@ -61,6 +49,18 @@ public function pendingCount(User $user): int
             ->count();
     }
 
+    public function paginated(User $user, int $perPage = 25, string $search = '', ?string $type = null, ?string $status = null): LengthAwarePaginator
+    {
+        return Feedback::query()
+            ->where('user_id', $user->id)
+            ->with(['user.profile', 'handler.profile'])
+            ->when($search, fn ($q) => $q->where('subject', 'like', "%{$search}%"))
+            ->when($type, fn ($q) => $q->where('type', $type))
+            ->when($status, fn ($q) => $q->where('status', $status))
+            ->latest()
+            ->paginate($perPage);
+    }
+
     public function create(User $user, array $data): Feedback
     {
         return Feedback::create([
diff --git a/resources/js/pages/admin/feedback/columns.tsx b/resources/js/pages/admin/feedback/columns.tsx
index 112887a..1e8408b 100644
--- a/resources/js/pages/admin/feedback/columns.tsx
+++ b/resources/js/pages/admin/feedback/columns.tsx
@@ -31,13 +31,6 @@ export const FeedbackStatusVariants: Record<
     resolved: 'default',
 };
 
-function stripHtml(html: string): string {
-    return html
-        .replace(/<[^>]+>/g, ' ')
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-
 export function createFeedbackColumns(
     params: CreateColumnsParams,
 ): ColumnDef<Feedback>[] {
@@ -55,7 +48,7 @@ export function createFeedbackColumns(
     return [
         {
             accessorKey: 'subject',
-            header: () => <span>Subjek</span>
+            header: () => <span>Subjek</span>,
         },
         {
             accessorKey: 'type',
@@ -93,6 +86,11 @@ export function createFeedbackColumns(
                 </div>
             ),
         },
+        {
+            accessorKey: 'user.profile.full_name',
+            header: () => <span>Dibuat Oleh</span>,
+            cell: ({ row }) => row.original.user?.profile?.full_name ?? '-',
+        },
         {
             accessorKey: 'handler.profile.full_name',
             header: () => <span>Ditindaklanjuti Oleh</span>,
diff --git a/resources/js/pages/admin/feedback/index.tsx b/resources/js/pages/admin/feedback/index.tsx
index da0f8e0..b01e61d 100644
--- a/resources/js/pages/admin/feedback/index.tsx
+++ b/resources/js/pages/admin/feedback/index.tsx
@@ -358,12 +358,12 @@ function ViewDetailDialog({
     return (
         <Dialog open={open} onOpenChange={onOpenChange}>
             <DialogContent className="flex max-h-[85vh] flex-col overflow-hidden sm:max-w-3xl">
-                <DialogHeader>
+                <DialogHeader className="shrink-0">
                     <DialogTitle>Detail Kritik dan Saran</DialogTitle>
                 </DialogHeader>
 
                 {feedback && (
-                    <div className="grid gap-4 overflow-y-auto">
+                    <div className="grid min-h-0 flex-1 gap-4 overflow-y-auto">
                         <div className="flex flex-wrap items-center gap-2">
                             <Badge variant="outline">
                                 {FeedbackTypeLabels[feedback.type]}
@@ -391,6 +391,13 @@ function ViewDetailDialog({
                             <p className="font-medium">{feedback.subject}</p>
                         </div>
 
+                        <div className="grid gap-1">
+                            <Label className="text-muted-foreground">
+                                Dibuat Oleh
+                            </Label>
+                            <p>{feedback.user?.profile?.full_name ?? '-'}</p>
+                        </div>
+
                         <div className="grid gap-1">
                             <Label className="text-muted-foreground">
                                 Ditindaklanjuti Oleh
diff --git a/resources/js/types/feedback.ts b/resources/js/types/feedback.ts
index 365c356..3db5ec9 100644
--- a/resources/js/types/feedback.ts
+++ b/resources/js/types/feedback.ts
@@ -23,8 +23,15 @@ export type FeedbackHandler = {
     profile: { full_name: string } | null;
 };
 
+export type FeedbackUser = {
+    id: number;
+    profile: { full_name: string } | null;
+};
+
 export type Feedback = {
     id: number;
+    user_id: number;
+    user: FeedbackUser | null;
     type: FeedbackTypeValue;
     subject: string;
     message: string;