From 5f9543f6fc55a4aa71951c5c2df9ac93967e7b4b Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Wed, 5 Feb 2025 22:35:07 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20fix:=20enhance=20UI/UX?=
 =?UTF-8?q?=20and=20address=20a11y=20issues=20in=20SetKeyDialog=20(#5672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ refactor: Improve UI consistency and accessibility in SetKeyDialog components

* 🎨 style: Add cursor pointer to Slider component for better UX

* 🐛 chore: Remove unnecessary console log from SetKeyDialog component
---
 .../Input/SetKeyDialog/GoogleConfig.tsx       |  4 +--
 .../Input/SetKeyDialog/HelpText.tsx           | 35 +++----------------
 .../Input/SetKeyDialog/InputWithLabel.tsx     |  6 ++--
 .../Input/SetKeyDialog/SetKeyDialog.tsx       |  3 +-
 client/src/components/ui/Dropdown.tsx         |  4 ++-
 client/src/components/ui/OGDialogTemplate.tsx |  8 ++++-
 client/src/components/ui/Slider.tsx           |  5 ++-
 7 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx b/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx
index 51abdd0055..c6f2eafd24 100644
--- a/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx
+++ b/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx
@@ -28,9 +28,9 @@ const GoogleConfig = ({ userKey, setUserKey }: Pick<TConfigProps, 'userKey' | 's
         <Label htmlFor={AuthKeys.GOOGLE_SERVICE_KEY} className="text-left text-sm font-medium">
           {localize('com_endpoint_config_google_service_key')}
         </Label>
-        <div className="mx-1 text-left text-sm text-gray-700 dark:text-gray-400">
+        <Label className="mx-1 text-right text-sm text-text-secondary">
           {localize('com_endpoint_config_google_cloud_platform')}
-        </div>
+        </Label>
         <br />
       </div>
       <FileUpload
diff --git a/client/src/components/Input/SetKeyDialog/HelpText.tsx b/client/src/components/Input/SetKeyDialog/HelpText.tsx
index 59cb0a46fe..568dccdb16 100644
--- a/client/src/components/Input/SetKeyDialog/HelpText.tsx
+++ b/client/src/components/Input/SetKeyDialog/HelpText.tsx
@@ -5,34 +5,9 @@ import { useLocalize } from '~/hooks';
 function HelpText({ endpoint }: { endpoint: string }) {
   const localize = useLocalize();
   const textMap = {
-    [EModelEndpoint.chatGPTBrowser]: (
-      <small className="break-all text-gray-500">
-        {localize('com_endpoint_config_key_chatgpt')}{' '}
-        <a
-          target="_blank"
-          href="https://chat.openai.com"
-          rel="noreferrer"
-          className="text-blue-600 underline"
-        >
-          https://chat.openai.com
-        </a>
-        {', '}
-        {localize('com_endpoint_config_key_chatgpt_then_visit')}{' '}
-        <a
-          target="_blank"
-          href="https://chat.openai.com/api/auth/session"
-          rel="noreferrer"
-          className="text-blue-600 underline"
-        >
-          https://chat.openai.com/api/auth/session
-        </a>
-        {'. '}
-        {localize('com_endpoint_config_key_chatgpt_copy_token')}
-      </small>
-    ),
     [EModelEndpoint.google]: (
       <>
-        <small className="break-all text-gray-500">
+        <small className="mt-4 break-all text-text-secondary">
           {localize('com_endpoint_config_google_service_key')}
           {': '}
           {localize('com_endpoint_config_key_google_need_to')}{' '}
@@ -40,7 +15,7 @@ function HelpText({ endpoint }: { endpoint: string }) {
             target="_blank"
             href="https://console.cloud.google.com/vertex-ai"
             rel="noreferrer"
-            className="text-blue-600 underline"
+            className="text-blue-700 underline dark:text-blue-400"
           >
             {localize('com_endpoint_config_key_google_vertex_ai')}
           </a>{' '}
@@ -49,14 +24,14 @@ function HelpText({ endpoint }: { endpoint: string }) {
             target="_blank"
             href="https://console.cloud.google.com/projectselector/iam-admin/serviceaccounts/create?walkthrough_id=iam--create-service-account#step_index=1"
             rel="noreferrer"
-            className="text-blue-600 underline"
+            className="text-blue-700 underline dark:text-blue-400"
           >
             {localize('com_endpoint_config_key_google_service_account')}
           </a>
           {'. '}
           {localize('com_endpoint_config_key_google_vertex_api_role')}
         </small>
-        <small className="break-all text-gray-500">
+        <small className="break-all text-text-secondary">
           {localize('com_endpoint_config_google_api_key')}
           {': '}
           {localize('com_endpoint_config_google_api_info')}{' '}
@@ -64,7 +39,7 @@ function HelpText({ endpoint }: { endpoint: string }) {
             target="_blank"
             href="https://makersuite.google.com/app/apikey"
             rel="noreferrer"
-            className="text-blue-600 underline"
+            className="text-blue-700 underline dark:text-blue-400"
           >
             {localize('com_endpoint_config_click_here')}
           </a>{' '}
diff --git a/client/src/components/Input/SetKeyDialog/InputWithLabel.tsx b/client/src/components/Input/SetKeyDialog/InputWithLabel.tsx
index 9517f91737..a45ab02325 100644
--- a/client/src/components/Input/SetKeyDialog/InputWithLabel.tsx
+++ b/client/src/components/Input/SetKeyDialog/InputWithLabel.tsx
@@ -20,13 +20,11 @@ const InputWithLabel: FC<InputWithLabelProps> = forwardRef((props, ref) => {
   const localize = useLocalize();
   return (
     <>
-      <div className={cn('flex flex-row', labelClassName)}>
+      <div className={cn('mt-4 flex flex-row', labelClassName)}>
         <Label htmlFor={id} className="text-left text-sm font-medium">
           {label}
         </Label>
-        {subLabel && (
-          <div className="mx-1 text-left text-sm text-gray-700 dark:text-gray-400">{subLabel}</div>
-        )}
+        {Label && <Label className="mx-1 text-right text-sm text-text-secondary">{subLabel}</Label>}
         <br />
       </div>
       <div className="h-1" />
diff --git a/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx b/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx
index 5706265feb..0cd8cf3d72 100644
--- a/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx
+++ b/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx
@@ -163,7 +163,7 @@ const SetKeyDialog = ({
     <OGDialog open={open} onOpenChange={onOpenChange}>
       <OGDialogTemplate
         title={`${localize('com_endpoint_config_key_for')} ${alternateName[endpoint] ?? endpoint}`}
-        className="w-11/12 max-w-[650px] sm:w-3/4 md:w-3/4 lg:w-3/4"
+        className="w-11/12 max-w-2xl"
         showCancelButton={false}
         main={
           <div className="grid w-full items-center gap-2">
@@ -180,6 +180,7 @@ const SetKeyDialog = ({
               onChange={handleExpirationChange}
               options={expirationOptions.map((option) => option.label)}
               sizeClasses="w-[185px]"
+              portal={false}
             />
             <div className="mt-2" />
             <FormProvider {...methods}>
diff --git a/client/src/components/ui/Dropdown.tsx b/client/src/components/ui/Dropdown.tsx
index 1f3ab1e534..559bb6555b 100644
--- a/client/src/components/ui/Dropdown.tsx
+++ b/client/src/components/ui/Dropdown.tsx
@@ -15,6 +15,7 @@ interface DropdownProps {
   iconOnly?: boolean;
   renderValue?: (option: Option) => React.ReactNode;
   ariaLabel?: string;
+  portal?: boolean;
 }
 
 const isDivider = (item: string | Option | { divider: true }): item is { divider: true } =>
@@ -35,6 +36,7 @@ const Dropdown: React.FC<DropdownProps> = ({
   iconOnly = false,
   renderValue,
   ariaLabel,
+  portal = true,
 }) => {
   const handleChange = (value: string) => {
     onChange(value);
@@ -93,7 +95,7 @@ const Dropdown: React.FC<DropdownProps> = ({
         {!iconOnly && <Select.SelectArrow />}
       </Select.Select>
       <Select.SelectPopover
-        portal
+        portal={portal}
         store={selectProps}
         className={cn('popover-ui', sizeClasses, className, 'max-h-[80vh] overflow-y-auto')}
       >
diff --git a/client/src/components/ui/OGDialogTemplate.tsx b/client/src/components/ui/OGDialogTemplate.tsx
index fb17e1ee8b..c0602e60ca 100644
--- a/client/src/components/ui/OGDialogTemplate.tsx
+++ b/client/src/components/ui/OGDialogTemplate.tsx
@@ -76,7 +76,13 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi
       </OGDialogHeader>
       <div className={cn('px-0 py-2', mainClassName)}>{main != null ? main : null}</div>
       <OGDialogFooter className={footerClassName}>
-        <div>{leftButtons != null ? <div className="mt-3 sm:mt-0">{leftButtons}</div> : null}</div>
+        <div>
+          {leftButtons != null ? (
+            <div className="mt-3 flex h-auto gap-3 max-sm:w-full max-sm:flex-col sm:mt-0 sm:flex-row">
+              {leftButtons}
+            </div>
+          ) : null}
+        </div>
         <div className="flex h-auto gap-3 max-sm:w-full max-sm:flex-col sm:flex-row">
           {buttons != null ? buttons : null}
           {showCancelButton && (
diff --git a/client/src/components/ui/Slider.tsx b/client/src/components/ui/Slider.tsx
index 69874801b4..74908b4e62 100644
--- a/client/src/components/ui/Slider.tsx
+++ b/client/src/components/ui/Slider.tsx
@@ -8,7 +8,10 @@ const Slider = React.forwardRef<
     >(({ className, onDoubleClick, ...props }, ref) => (
       <SliderPrimitive.Root
         ref={ref}
-        className={cn('relative flex w-full touch-none select-none items-center', className)}
+        className={cn(
+          'relative flex w-full cursor-pointer touch-none select-none items-center',
+          className,
+        )}
         onDoubleClick={onDoubleClick}
         {...props}
       >