From 0dfcd1050526347343aff9776df08508207dac3f Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 21 Oct 2024 23:28:10 +0200 Subject: [PATCH] improved read cmd dialog --- interface/src/app/status/SystemLog.tsx | 75 ++++++++++++++++---------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/interface/src/app/status/SystemLog.tsx b/interface/src/app/status/SystemLog.tsx index a364674ae..b644b48f5 100644 --- a/interface/src/app/status/SystemLog.tsx +++ b/interface/src/app/status/SystemLog.tsx @@ -91,7 +91,7 @@ const SystemLog = () => { }); const { send } = useRequest( - (data: string) => API({ device: 'system', cmd: 'read', id: 0, value: data }), + (data: string) => API({ device: 'system', cmd: 'read', id: 0, data: data }), { immediate: false } @@ -176,10 +176,12 @@ const SystemLog = () => { setReadOpen(!readOpen); return; } - void send(readValue); - console.log('send read command', readValue); // TODO remove - setReadOpen(false); - setReadValue(''); + + if (readValue.split(' ').filter((word) => word !== '').length > 1) { + void send(readValue); + setReadOpen(false); + setReadValue(''); + } }; const content = () => { @@ -271,31 +273,50 @@ const SystemLog = () => { )} - {data.developer_mode && ( - - {readOpen && ( - { - const value = event.target.value; - if (value !== '' && !ALPHA_NUMERIC_DASH_REGEX.test(value)) { - return; - } - setReadValue(value); - }} - focused={true} - label="Send Read command" - variant="outlined" - helperText=" [offset] [length]" - size="small" - /> - )} - - + {readOpen ? ( + { + e.preventDefault(); + sendReadCommand(); + }} + > + { + setReadOpen(false); + setReadValue(''); + }} + > + - + { + const value = e.target.value; + if (value !== '' && !ALPHA_NUMERIC_DASH_REGEX.test(value)) { + return; + } + setReadValue(value); + }} + focused={true} + size="small" + label="Send Read command" // doesn't need translating - developer only + helperText=" [offset] [len]" + /> + + ) : ( + <> + {data.developer_mode && ( + + + + )} + )} +