From 2f8c0b6b268d8391c3da2e85db4d246c30d65157 Mon Sep 17 00:00:00 2001
From: ayana <ayanahye2@gmail.com>
Date: Wed, 11 Jun 2025 19:34:07 -0700
Subject: [PATCH 1/2] Feat: add modal to display for evaluation information in
 Feedbacks

---
 .../admin/Evaluations/FeedbackModal.svelte    | 73 +++++++++++++++++++
 .../admin/Evaluations/Feedbacks.svelte        | 16 +++-
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/components/admin/Evaluations/FeedbackModal.svelte

diff --git a/src/lib/components/admin/Evaluations/FeedbackModal.svelte b/src/lib/components/admin/Evaluations/FeedbackModal.svelte
new file mode 100644
index 000000000..68df3d1ba
--- /dev/null
+++ b/src/lib/components/admin/Evaluations/FeedbackModal.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	import Modal from '$lib/components/common/Modal.svelte';
+	import { getContext, createEventDispatcher } from 'svelte';
+	const i18n = getContext('i18n');
+	const dispatch = createEventDispatcher();
+
+	export let show = false;
+	export let selectedFeedback = null;
+
+	const close = () => {
+		show = false;
+		dispatch('close');
+	};
+</script>
+
+<Modal size="sm" bind:show>
+	{#if selectedFeedback}
+		<div>
+			<div class="flex justify-between dark:text-gray-300 px-5 pt-4 pb-2">
+				<div class="text-lg font-medium self-center">
+					{$i18n.t('Feedback Details')}
+				</div>
+				<button class="self-center" on:click={close} aria-label="Close">
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 20 20"
+						fill="currentColor"
+						class="w-5 h-5"
+					>
+						<path
+							d="M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z"
+						/>
+					</svg>
+				</button>
+			</div>
+
+			<div class="flex flex-col md:flex-row w-full px-5 pb-4 md:space-x-4 dark:text-gray-200">
+				<div class="flex flex-col w-full">
+					<div class="mb-2">
+						<strong>{$i18n.t('Rating')}:</strong>
+						<span>{selectedFeedback.data.details?.rating ?? '-'}</span>
+					</div>
+					<div class="mb-2">
+						<strong>{$i18n.t('Reason')}:</strong>
+						<span>{selectedFeedback.data.reason || '-'}</span>
+					</div>
+					<div class="mb-2">
+						<strong>{$i18n.t('Tags')}:</strong>
+						{#if selectedFeedback.data.tags && selectedFeedback.data.tags.length}
+							<div class="flex flex-wrap gap-1 mt-1">
+								{#each selectedFeedback.data.tags as tag}
+									<span class="px-2 py-0.5 rounded bg-gray-100 dark:bg-gray-800 text-xs">{tag}</span
+									>
+								{/each}
+							</div>
+						{:else}
+							<span>-</span>
+						{/if}
+					</div>
+					<div class="flex justify-end pt-3">
+						<button
+							class="px-3.5 py-1.5 text-sm font-medium bg-black hover:bg-gray-900 text-white dark:bg-white dark:text-black dark:hover:bg-gray-100 transition rounded-full"
+							type="button"
+							on:click={close}
+						>
+							{$i18n.t('Close')}
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	{/if}
+</Modal>
diff --git a/src/lib/components/admin/Evaluations/Feedbacks.svelte b/src/lib/components/admin/Evaluations/Feedbacks.svelte
index 726028664..814e863ba 100644
--- a/src/lib/components/admin/Evaluations/Feedbacks.svelte
+++ b/src/lib/components/admin/Evaluations/Feedbacks.svelte
@@ -18,6 +18,7 @@
 	import CloudArrowUp from '$lib/components/icons/CloudArrowUp.svelte';
 	import Pagination from '$lib/components/common/Pagination.svelte';
 	import FeedbackMenu from './FeedbackMenu.svelte';
+	import FeedbackModal from './FeedbackModal.svelte';
 	import EllipsisHorizontal from '$lib/components/icons/EllipsisHorizontal.svelte';
 
 	export let feedbacks = [];
@@ -48,6 +49,14 @@
 		lost: number;
 	};
 
+	let showFeedbackModal = false;
+	let selectedFeedback = null;
+
+	const openFeedbackModal = (feedback) => {
+		showFeedbackModal = true;
+		selectedFeedback = feedback;
+	};
+
 	//////////////////////
 	//
 	// CRUD operations
@@ -106,6 +115,8 @@
 	};
 </script>
 
+<FeedbackModal bind:show={showFeedbackModal} {selectedFeedback} />
+
 <div class="mt-0.5 mb-2 gap-1 flex flex-row justify-between">
 	<div class="flex md:self-center text-lg font-medium px-0.5">
 		{$i18n.t('Feedback History')}
@@ -167,7 +178,10 @@
 			</thead>
 			<tbody class="">
 				{#each paginatedFeedbacks as feedback (feedback.id)}
-					<tr class="bg-white dark:bg-gray-900 dark:border-gray-850 text-xs">
+					<tr
+						class="bg-white dark:bg-gray-900 dark:border-gray-850 text-xs cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-800 transition"
+						on:click={() => openFeedbackModal(feedback)}
+					>
 						<td class=" py-0.5 text-right font-semibold">
 							<div class="flex justify-center">
 								<Tooltip content={feedback?.user?.name}>

From 880323a4e4197b9a6b7108f5b8d9266ee15c4484 Mon Sep 17 00:00:00 2001
From: ayana <ayanahye2@gmail.com>
Date: Thu, 12 Jun 2025 10:53:55 -0700
Subject: [PATCH 2/2] update based on requested changes

---
 .../admin/Evaluations/FeedbackModal.svelte        | 15 ++++++++-------
 .../components/admin/Evaluations/Feedbacks.svelte |  7 ++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/lib/components/admin/Evaluations/FeedbackModal.svelte b/src/lib/components/admin/Evaluations/FeedbackModal.svelte
index 68df3d1ba..804cd0e48 100644
--- a/src/lib/components/admin/Evaluations/FeedbackModal.svelte
+++ b/src/lib/components/admin/Evaluations/FeedbackModal.svelte
@@ -1,15 +1,16 @@
 <script lang="ts">
 	import Modal from '$lib/components/common/Modal.svelte';
-	import { getContext, createEventDispatcher } from 'svelte';
+	import { getContext } from 'svelte';
 	const i18n = getContext('i18n');
-	const dispatch = createEventDispatcher();
 
 	export let show = false;
 	export let selectedFeedback = null;
 
+	export let onClose: () => void = () => {};
+
 	const close = () => {
 		show = false;
-		dispatch('close');
+		onClose();
 	};
 </script>
 
@@ -38,17 +39,17 @@
 				<div class="flex flex-col w-full">
 					<div class="mb-2">
 						<strong>{$i18n.t('Rating')}:</strong>
-						<span>{selectedFeedback.data.details?.rating ?? '-'}</span>
+						<span>{selectedFeedback?.data?.details?.rating ?? '-'}</span>
 					</div>
 					<div class="mb-2">
 						<strong>{$i18n.t('Reason')}:</strong>
-						<span>{selectedFeedback.data.reason || '-'}</span>
+						<span>{selectedFeedback?.data?.reason || '-'}</span>
 					</div>
 					<div class="mb-2">
 						<strong>{$i18n.t('Tags')}:</strong>
-						{#if selectedFeedback.data.tags && selectedFeedback.data.tags.length}
+						{#if selectedFeedback?.data?.tags && selectedFeedback?.data?.tags.length}
 							<div class="flex flex-wrap gap-1 mt-1">
-								{#each selectedFeedback.data.tags as tag}
+								{#each selectedFeedback?.data?.tags as tag}
 									<span class="px-2 py-0.5 rounded bg-gray-100 dark:bg-gray-800 text-xs">{tag}</span
 									>
 								{/each}
diff --git a/src/lib/components/admin/Evaluations/Feedbacks.svelte b/src/lib/components/admin/Evaluations/Feedbacks.svelte
index 814e863ba..e51fe1f10 100644
--- a/src/lib/components/admin/Evaluations/Feedbacks.svelte
+++ b/src/lib/components/admin/Evaluations/Feedbacks.svelte
@@ -57,6 +57,11 @@
 		selectedFeedback = feedback;
 	};
 
+	const closeFeedbackModal = () => {
+		showFeedbackModal = false;
+		selectedFeedback = null;
+	};
+
 	//////////////////////
 	//
 	// CRUD operations
@@ -115,7 +120,7 @@
 	};
 </script>
 
-<FeedbackModal bind:show={showFeedbackModal} {selectedFeedback} />
+<FeedbackModal bind:show={showFeedbackModal} {selectedFeedback} onClose={closeFeedbackModal} />
 
 <div class="mt-0.5 mb-2 gap-1 flex flex-row justify-between">
 	<div class="flex md:self-center text-lg font-medium px-0.5">