Fix

Author: devksingh4

src/ui/pages/roomRequest/ViewRoomRequest.page.tsx

@@ -55,6 +55,9 @@ export const ViewRoomRequest: React.FC = () => {
   const [data, setData] = useState<RoomRequestGetResponse | null>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [uploadedFile, setUploadedFile] = useState<FileWithPath | null>(null);
+  const [downloadingAttachment, setDownloadingAttachment] = useState<
+    string | null
+  >(null);
 
   const newStatusForm = useForm<{
     status: RoomRequestStatus | null;
@@ -103,6 +106,8 @@ export const ViewRoomRequest: React.FC = () => {
     if (!filename) {
       return;
     }
+    const attachmentKey = `${createdAt}#${status}`;
+    setDownloadingAttachment(attachmentKey);
     try {
       const response = await api.get<{ downloadUrl: string }>(
         `/api/v1/roomRequests/${semesterId}/${requestId}/attachmentDownloadUrl/${createdAt}/${status}`,
@@ -115,6 +120,8 @@ export const ViewRoomRequest: React.FC = () => {
         color: "red",
         icon: <IconAlertCircle size={16} />,
       });
+    } finally {
+      setDownloadingAttachment(null);
     }
   };
 
@@ -457,16 +464,28 @@ export const ViewRoomRequest: React.FC = () => {
                       <Button
                         size="xs"
                         variant="light"
-                        leftSection={<IconDownload size={14} />}
+                        leftSection={
+                          downloadingAttachment ===
+                          `${x.createdAt}#${x.status}` ? (
+                            <Loader size={14} />
+                          ) : (
+                            <IconDownload size={14} />
+                          )
+                        }
                         onClick={() =>
                           handleDownloadAttachment(
                             x.createdAt,
                             x.status,
                             x.attachmentFilename,
                           )
                         }
+                        disabled={
+                          downloadingAttachment === `${x.createdAt}#${x.status}`
+                        }
                       >
-                        {x.attachmentFilename}
+                        {downloadingAttachment === `${x.createdAt}#${x.status}`
+                          ? "Downloading..."
+                          : x.attachmentFilename}
                       </Button>
                     )}
                     {x.createdAt && (

src/ui/util/s3.test.ts

@@ -15,7 +15,9 @@ import { InternalServerError } from "../../src/common/errors/index.js";
 // Note: We use vi.mock here instead of aws-sdk-client-mock because
 // getSignedUrl is a standalone function, not an S3Client command
 vi.mock("@aws-sdk/s3-request-presigner", () => ({
-  getSignedUrl: vi.fn(),
+  getSignedUrl: vi
+    .fn()
+    .mockResolvedValue("https://s3.amazonaws.com/bucket/key?signature=xyz"),
 }));
 
 describe("S3 Presigned URL Functions", () => {
@@ -28,7 +30,7 @@ describe("S3 Presigned URL Functions", () => {
       const mockUrl = "https://s3.amazonaws.com/bucket/key?signature=xyz";
       const mockS3Client = new S3Client({ region: "us-east-1" });
 
-      vi.mocked(getSignedUrl).mockResolvedValueOnce(mockUrl);
+      vi.mocked(getSignedUrl);
 
       const result = await createPresignedPut({
         s3client: mockS3Client,
@@ -51,8 +53,6 @@ describe("S3 Presigned URL Functions", () => {
       const mockUrl = "https://s3.amazonaws.com/bucket/key?signature=abc";
       const mockS3Client = new S3Client({ region: "us-east-1" });
 
-      vi.mocked(getSignedUrl).mockResolvedValueOnce(mockUrl);
-
       const result = await createPresignedPut({
         s3client: mockS3Client,
         bucketName: "test-bucket",
@@ -71,11 +71,9 @@ describe("S3 Presigned URL Functions", () => {
     });
 
     test("creates a presigned PUT URL with MD5 hash", async () => {
-      const mockUrl = "https://s3.amazonaws.com/bucket/key?signature=def";
+      const mockUrl = "https://s3.amazonaws.com/bucket/key?signature=xyz";
       const mockS3Client = new S3Client({ region: "us-east-1" });
 
-      vi.mocked(getSignedUrl).mockResolvedValueOnce(mockUrl);
-
       const result = await createPresignedPut({
         s3client: mockS3Client,
         bucketName: "test-bucket",