From 9e40b5b7bea60e6802a4b448ef315b14fba4de7f Mon Sep 17 00:00:00 2001 From: 苏向夜 Date: Mon, 2 Mar 2026 10:26:21 +0800 Subject: feat(ui): java config --- packages/ui/src/pages/settings.tsx | 90 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 3 deletions(-) (limited to 'packages/ui/src/pages/settings.tsx') diff --git a/packages/ui/src/pages/settings.tsx b/packages/ui/src/pages/settings.tsx index 440a5dc..9387e23 100644 --- a/packages/ui/src/pages/settings.tsx +++ b/packages/ui/src/pages/settings.tsx @@ -1,6 +1,7 @@ import { toNumber } from "es-toolkit/compat"; import { FileJsonIcon } from "lucide-react"; import { useEffect, useState } from "react"; +import { toast } from "sonner"; import { migrateSharedCaches } from "@/client"; import { ConfigEditor } from "@/components/config-editor"; import { Button } from "@/components/ui/button"; @@ -13,9 +14,11 @@ import { FieldLabel, FieldLegend, FieldSet, + FieldTitle, } from "@/components/ui/field"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; +import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"; import { ScrollArea } from "@/components/ui/scroll-area"; import { Select, @@ -28,18 +31,40 @@ import { import { Spinner } from "@/components/ui/spinner"; import { Switch } from "@/components/ui/switch"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; +import { useJavaStore } from "@/models/java"; import { useSettingsStore } from "@/models/settings"; export type SettingsTab = "general" | "appearance" | "advanced"; export function SettingsPage() { const { config, ...settings } = useSettingsStore(); + const javaStore = useJavaStore(); const [showConfigEditor, setShowConfigEditor] = useState(false); const [activeTab, setActiveTab] = useState("general"); useEffect(() => { - if (!config) settings.refresh(); - }, [config, settings.refresh]); + const refresh = async () => { + try { + await settings.refresh(); + } catch (error) { + console.error(error); + toast.error(`Failed to refresh settings: ${error}`); + } + try { + await javaStore.refreshInstallations(); + if (!javaStore.catalog) await javaStore.refresh(); + } catch (error) { + console.error(error); + toast.error(`Failed to refresh java catalogs: ${error}`); + } + }; + refresh(); + }, [ + settings.refresh, + javaStore.refresh, + javaStore.refreshInstallations, + javaStore.catalog, + ]); const renderScrollArea = () => { if (!config) { @@ -158,7 +183,66 @@ export function SettingsPage() { Java Installations - + + + + Java Path + { + settings.merge({ + javaPath: e.target.value, + }); + }} + onBlur={() => { + settings.save(); + }} + /> + +
+ Java Installations + {javaStore.installations ? ( + { + settings.merge({ + javaPath: value, + }); + settings.save(); + }} + > + {javaStore.installations?.map((installation) => ( + + + + + {installation.vendor} ({installation.version}) + + + {installation.path} + + + + + + ))} + + ) : ( +
+ +
+ )} +
+
+
-- cgit v1.2.3-70-g09d2