Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added fix for any change to product name now resulting in show the spinner as custom on page reload

This commit is contained in:
JackTheRooster 2025-02-26 22:11:35 -06:00
parent 6d11eb544f
commit 198b2bb529
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ui/src/components/sidebar/settings.tsx
View File

@ -14,7 +14,7 @@ import { SectionHeader } from "@components/SectionHeader";
import { GridCard } from "@components/Card"; import { GridCard } from "@components/Card";
import { CheckCircleIcon } from "@heroicons/react/20/solid"; import { CheckCircleIcon } from "@heroicons/react/20/solid";
import { cx } from "@/cva.config"; import { cx } from "@/cva.config";
import React, { useCallback, useEffect, useRef, useState } from "react"; import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
import { isOnDevice } from "@/main"; import { isOnDevice } from "@/main";
import PointingFinger from "@/assets/pointing-finger.svg"; import PointingFinger from "@/assets/pointing-finger.svg";
import MouseIcon from "@/assets/mouse-icon.svg"; import MouseIcon from "@/assets/mouse-icon.svg";
@ -130,24 +130,7 @@ export default function SettingsSidebar() {
}); });
}, [send]); }, [send]);
const syncUsbConfigProduct = useCallback(() => { const usbConfigs = useMemo(() => [
send("getUsbConfig", {}, resp => {
if ("error" in resp) {
console.error("Failed to load USB Config:", resp.error);
} else {
console.log("syncUsbConfigProduct#getUsbConfig result:", resp.result);
const usbConfigState = resp.result as UsbConfigState
setUsbConfigProduct(usbConfigState.product);
}
});
}, [send, setUsbConfigProduct]);
// Load stored usb config product from the backend
useEffect(() => {
syncUsbConfigProduct();
}, [syncUsbConfigProduct]);
const usbConfigs = [
{ {
label: "JetKVM Default", label: "JetKVM Default",
value: "JetKVM USB Emulation Device" value: "JetKVM USB Emulation Device"
@ -164,7 +147,8 @@ export default function SettingsSidebar() {
label: "Dell Multimedia Pro Keyboard", label: "Dell Multimedia Pro Keyboard",
value: "Multimedia Pro Keyboard" value: "Multimedia Pro Keyboard"
} }
]; ], []);
interface USBConfig { interface USBConfig {
vendor_id: string; vendor_id: string;
@ -208,6 +192,24 @@ export default function SettingsSidebar() {
} }
} }
const syncUsbConfigProduct = useCallback(() => {
send("getUsbConfig", {}, resp => {
if ("error" in resp) {
console.error("Failed to load USB Config:", resp.error);
} else {
console.log("syncUsbConfigProduct#getUsbConfig result:", resp.result);
const usbConfigState = resp.result as UsbConfigState
const product = usbConfigs.map(u => u.value).includes(usbConfigState.product) ? usbConfigState.product : "custom"
setUsbConfigProduct(product);
}
});
}, [send, usbConfigs]);
// Load stored usb config product from the backend
useEffect(() => {
syncUsbConfigProduct();
}, [syncUsbConfigProduct]);
const handleUsbEmulationToggle = useCallback( const handleUsbEmulationToggle = useCallback(
(enabled: boolean) => { (enabled: boolean) => {
send("setUsbEmulationState", { enabled: enabled }, resp => { send("setUsbEmulationState", { enabled: enabled }, resp => {
@ -1093,7 +1095,7 @@ export default function SettingsSidebar() {
options={[...usbConfigs, { value: "custom", label: "Custom" }]} options={[...usbConfigs, { value: "custom", label: "Custom" }]}
/> />
</SettingsItem> </SettingsItem>
{usbConfigProduct === "custom" && ( {(usbConfigProduct === "custom") && (
<SettingsItem <SettingsItem
title="USB Config" title="USB Config"
description="Set Custom USB Descriptors" description="Set Custom USB Descriptors"