fixes and improvements

This commit is contained in:
2026-05-07 12:34:16 +02:00
parent 2ecca84892
commit bba23165ab
14 changed files with 860 additions and 158 deletions
+19 -59
View File
@@ -78,13 +78,20 @@ function MachineEditor({
hint,
machine,
sshKeys,
onChange,
}: {
title: string;
hint?: string;
machine: MonitoringMachineInput;
sshKeys: SSHKey[];
onChange: (
draft:
| MonitoringMachineInput
| ((current: MonitoringMachineInput) => MonitoringMachineInput),
) => void;
}) {
const [draft, setDraft] = useState(machine);
const draft = machine;
const setDraft = onChange;
const isLocal = draft.mode === "local";
const selectedSSHKey = sshKeys.find((key) => key.id === draft.ssh_key_id);
const enabledServices = draft.services.length;
@@ -246,34 +253,6 @@ function MachineEditor({
}
/>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField
fullWidth
size="small"
label="Key directory"
value={draft.key_directory}
onChange={(e) =>
setDraft((current) => ({
...current,
key_directory: e.target.value,
}))
}
/>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField
fullWidth
size="small"
label="Key name"
value={draft.key_name}
onChange={(e) =>
setDraft((current) => ({
...current,
key_name: e.target.value,
}))
}
/>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField
fullWidth
@@ -305,20 +284,6 @@ function MachineEditor({
}
/>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField
fullWidth
size="small"
label="Path prefix"
value={draft.path_prefix}
onChange={(e) =>
setDraft((current) => ({
...current,
path_prefix: e.target.value,
}))
}
/>
</Grid>
{hasJellyfin && (
<>
<Grid size={{ xs: 12, md: 6 }}>
@@ -1049,15 +1014,15 @@ export function Settings() {
host: machine.host,
port: machine.port,
username: machine.username,
key_directory: machine.key_directory,
key_name: machine.key_name,
ssh_key_id: machine.ssh_key_id,
key_directory: "",
key_name: "",
path_prefix: "",
ssh_key_id: machine.ssh_key_id,
ssh_private_key: "",
ssh_private_key_passphrase: "",
password: "",
media_root: machine.media_root,
path_prefix: machine.path_prefix,
jellyfin_url: machine.jellyfin_url,
jellyfin_url: machine.jellyfin_url,
jellyfin_user_id: machine.jellyfin_user_id,
jellyfin_api_key: "",
jellyseerr_url: machine.jellyseerr_url,
@@ -1148,12 +1113,6 @@ export function Settings() {
value={selectedMachine.username}
disabled
/>
<TextField
size="small"
label="Path prefix"
value={selectedMachine.path_prefix}
disabled
/>
</>
) : (
<TextField
@@ -1181,15 +1140,15 @@ export function Settings() {
host: selectedMachine.host,
port: selectedMachine.port,
username: selectedMachine.username,
key_directory: selectedMachine.key_directory,
key_name: selectedMachine.key_name,
ssh_key_id: selectedMachine.ssh_key_id,
key_directory: "",
key_name: "",
path_prefix: "",
ssh_key_id: selectedMachine.ssh_key_id,
ssh_private_key: "",
ssh_private_key_passphrase: "",
password: "",
media_root: selectedMachine.media_root,
path_prefix: selectedMachine.path_prefix,
jellyfin_url: selectedMachine.jellyfin_url,
jellyfin_url: selectedMachine.jellyfin_url,
jellyfin_user_id:
selectedMachine.jellyfin_user_id,
jellyfin_api_key: "",
@@ -1247,6 +1206,7 @@ export function Settings() {
}
machine={machineDraft}
sshKeys={sshKeys}
onChange={setMachineDraft}
/>
</DialogContent>
<DialogFooter