diff --git a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx index 2ca48050b..0350a1827 100644 --- a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx @@ -178,6 +178,7 @@ export default function GlobalVariablesPage() { pagination={false} columnDefs={colDefs} rowData={rowData} + containerStyle={{ overflow: "auto", maxWidth: "80vh" }} /> diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx index ffaaf63c1..b5d530c11 100644 --- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx @@ -114,10 +114,18 @@ export default function EditShortcutButton({ useEffect(() => { function onKeyDown(e: KeyboardEvent) { e.preventDefault(); + let fixedKey = e.key; if (key) { if (key.toUpperCase().includes(e.key.toUpperCase())) return; } - setKey((oldKey) => getFixedCombination({ oldKey: oldKey!, key: e.key })); + if (e.key?.toLowerCase() === "control") { + console.log("oi"); + fixedKey = "Ctrl"; + console.log(fixedKey); + } + setKey((oldKey) => + getFixedCombination({ oldKey: oldKey!, key: fixedKey }), + ); } document.addEventListener("keydown", onKeyDown); diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx index 2f84b3738..a1ef2f688 100644 --- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx @@ -86,7 +86,7 @@ export default function ShortcutsPage() { setOpen={setOpen} > diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts index 281278e2f..1ffe95b52 100644 --- a/src/frontend/src/utils/styleUtils.ts +++ b/src/frontend/src/utils/styleUtils.ts @@ -141,7 +141,8 @@ import { X, XCircle, Zap, - PlaySquare + PlaySquare, + Wrench, } from "lucide-react"; import { FaApple, FaGithub } from "react-icons/fa"; import { AWSIcon } from "../icons/AWS"; @@ -150,7 +151,7 @@ import { AnthropicIcon } from "../icons/Anthropic"; import { AstraDBIcon } from "../icons/AstraDB"; import { AzureIcon } from "../icons/Azure"; import { BingIcon } from "../icons/Bing"; -import { BotMessageSquareIcon} from "../icons/BotMessageSquare"; +import { BotMessageSquareIcon } from "../icons/BotMessageSquare"; import { ChromaIcon } from "../icons/ChromaIcon"; import { CohereIcon } from "../icons/Cohere"; import { ElasticsearchIcon } from "../icons/ElasticsearchStore"; @@ -518,4 +519,5 @@ export const nodeIconsLucide: iconsType = { ArrowBigUp, Dot, RotateCcw, + Wrench, };