From c9245855b96fa83e94ba08fe187ed8a083429e9b Mon Sep 17 00:00:00 2001 From: rajku-dev Date: Sun, 19 Jan 2025 07:10:52 +0530 Subject: [PATCH 1/7] Fix FileUploadDialog overflow | Use ShadCN component --- src/components/Files/FilesTab.tsx | 47 +++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx index fadb4358883..02acdd457e2 100644 --- a/src/components/Files/FilesTab.tsx +++ b/src/components/Files/FilesTab.tsx @@ -19,6 +19,8 @@ import { DropdownMenuItem, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; import { Progress } from "@/components/ui/progress"; import { Table, @@ -38,7 +40,6 @@ import { import AudioPlayer from "@/components/Common/AudioPlayer"; import Loading from "@/components/Common/Loading"; -import TextFormField from "@/components/Form/FormFields/TextFormField"; import { FileUploadModel } from "@/components/Patient/models"; import useFileManager from "@/hooks/useFileManager"; @@ -576,7 +577,7 @@ const FileUploadDialog = ({ aria-labelledby="file-upload-dialog" > @@ -601,19 +602,35 @@ const FileUploadDialog = ({ - fileUpload.setFileName(e.value, index)} - error={ - index === 0 && fileUpload.error ? fileUpload.error : undefined - } - /> +
+ + + fileUpload.setFileName(e.target.value, index) + } + /> + {index === 0 && fileUpload.error && ( +

+ {fileUpload.error} +

+ )} +
))} From 44dd07cc3f4570fb73816a549406f557f237445f Mon Sep 17 00:00:00 2001 From: Raj kumar <150310085+rajku-dev@users.noreply.github.com> Date: Sun, 19 Jan 2025 07:15:21 +0530 Subject: [PATCH 2/7] revert padding --- src/components/Files/FilesTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx index 02acdd457e2..a52f7a12aef 100644 --- a/src/components/Files/FilesTab.tsx +++ b/src/components/Files/FilesTab.tsx @@ -577,7 +577,7 @@ const FileUploadDialog = ({ aria-labelledby="file-upload-dialog" > From c24a77d57f9b60179a260b5f19f554b4d9107517 Mon Sep 17 00:00:00 2001 From: Raj kumar <150310085+rajku-dev@users.noreply.github.com> Date: Sun, 19 Jan 2025 07:16:19 +0530 Subject: [PATCH 3/7] revert css --- src/components/Files/FilesTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx index a52f7a12aef..8a1931db1be 100644 --- a/src/components/Files/FilesTab.tsx +++ b/src/components/Files/FilesTab.tsx @@ -577,7 +577,7 @@ const FileUploadDialog = ({ aria-labelledby="file-upload-dialog" > From e34edf3b7ea812531f9c667d205aec507dd37727 Mon Sep 17 00:00:00 2001 From: Raj kumar <150310085+rajku-dev@users.noreply.github.com> Date: Sun, 19 Jan 2025 10:48:44 +0530 Subject: [PATCH 4/7] Update src/components/Files/FilesTab.tsx Co-authored-by: Rithvik Nishad --- src/components/Files/FilesTab.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx index 8a1931db1be..b4989e87a98 100644 --- a/src/components/Files/FilesTab.tsx +++ b/src/components/Files/FilesTab.tsx @@ -614,11 +614,11 @@ const FileUploadDialog = ({ type="text" id={`upload-file-name-${index}`} required - className={`block w-full rounded-md border px-3 py-2 text-sm ${ + className={ index === 0 && fileUpload.error ? "border-red-500 focus:ring-red-500" : "border-gray-300 focus:ring-primary" - }`} + } value={fileUpload.fileNames[index] || ""} disabled={fileUpload.uploading} onChange={(e) => From cb68635101280ebd49ac1e46d5b5406b1ee5c471 Mon Sep 17 00:00:00 2001 From: rajku-dev Date: Sun, 19 Jan 2025 10:50:20 +0530 Subject: [PATCH 5/7] Fix Lint --- src/components/Files/FilesTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx index b4989e87a98..9a0b5b18828 100644 --- a/src/components/Files/FilesTab.tsx +++ b/src/components/Files/FilesTab.tsx @@ -618,7 +618,7 @@ const FileUploadDialog = ({ index === 0 && fileUpload.error ? "border-red-500 focus:ring-red-500" : "border-gray-300 focus:ring-primary" - } + } value={fileUpload.fileNames[index] || ""} disabled={fileUpload.uploading} onChange={(e) => From 71c2e8a5afaa22e72c79de2ecf774cbe94dacf05 Mon Sep 17 00:00:00 2001 From: rajku-dev Date: Mon, 20 Jan 2025 15:01:08 +0530 Subject: [PATCH 6/7] fix overfitting --- src/components/Files/FilesTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx index 9a0b5b18828..02e8feaf2ce 100644 --- a/src/components/Files/FilesTab.tsx +++ b/src/components/Files/FilesTab.tsx @@ -591,7 +591,7 @@ const FileUploadDialog = ({
- {file.name} + {file.name}