CEC-1235 Fix fleet name update (#196)

This commit is contained in:
arpanetus
2022-09-14 17:15:23 +06:00
committed by GitHub
parent 969b921aa1
commit 9c7a2b4577
2 changed files with 15 additions and 10 deletions

View File

@@ -26,7 +26,7 @@ exports[`FleetUpdate Render 1`] = `
class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth" class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
> >
<label <label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-disabled Mui-disabled Mui-required Mui-required" class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
data-shrink="false" data-shrink="false"
for="name" for="name"
id="name-label" id="name-label"
@@ -41,16 +41,14 @@ exports[`FleetUpdate Render 1`] = `
</span> </span>
</label> </label>
<div <div
class="MuiInputBase-root MuiOutlinedInput-root Mui-disabled Mui-disabled MuiInputBase-fullWidth MuiInputBase-formControl" class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
> >
<input <input
aria-invalid="false" aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input Mui-disabled Mui-disabled" class="MuiInputBase-input MuiOutlinedInput-input"
disabled=""
id="name" id="name"
maxlength="255" maxlength="255"
name="name" name="name"
readonly=""
required="" required=""
type="text" type="text"
value="" value=""

View File

@@ -24,7 +24,6 @@ import { logger } from "../../../services/monitoring";
const MainForm = () => { const MainForm = () => {
const queries = new URLSearchParams(useLocation().search); const queries = new URLSearchParams(useLocation().search);
const name = queries.get("name") ?? "";
const { fleet, getFleet, updateFleet, busy } = useFleetContext(); const { fleet, getFleet, updateFleet, busy } = useFleetContext();
const { token: { idToken: { jwtToken: token } } } = useUserContext(); const { token: { idToken: { jwtToken: token } } } = useUserContext();
@@ -32,6 +31,8 @@ const MainForm = () => {
const [redirect, setRedirect] = useState(null); const [redirect, setRedirect] = useState(null);
const classes = useStyles(); const classes = useStyles();
const [name, setName] = useState(queries.get("name") ?? "");
const [oldName, ] = useState(name);
const [selectedLogLevel, setSelectedLogLevel] = useState("info"); const [selectedLogLevel, setSelectedLogLevel] = useState("info");
const [canbusEnabled, setCANBusEnabled] = useState(true); const [canbusEnabled, setCANBusEnabled] = useState(true);
const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false); const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false);
@@ -56,7 +57,7 @@ const MainForm = () => {
(async () => { (async () => {
try { try {
if (!name || !token) return; if (!name || !token) return;
await getFleet(name, token); await getFleet(oldName, token);
} catch (e) { } catch (e) {
setMessage(e.message); setMessage(e.message);
logger.warn(e.stack); logger.warn(e.stack);
@@ -77,6 +78,10 @@ const MainForm = () => {
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [fleet]); }, [fleet]);
const onNameChange = (event) => {
setName(event.target.value);
}
const onLogLevelChange = (event) => { const onLogLevelChange = (event) => {
setSelectedLogLevel(event.target.value); setSelectedLogLevel(event.target.value);
} }
@@ -110,7 +115,10 @@ const MainForm = () => {
max_disk_buffer_size: canbusEnabled && dataLoggerEnabled ? parseInt(maxDiskBufferSize) : 0 max_disk_buffer_size: canbusEnabled && dataLoggerEnabled ? parseInt(maxDiskBufferSize) : 0
} }
}; };
const result = await updateFleet(name, formData, token);
console.log(oldName);
const result = await updateFleet(oldName, formData, token);
if (!result || result.error) return; if (!result || result.error) return;
setMessage(`Updated ${result.name}`); setMessage(`Updated ${result.name}`);
@@ -136,12 +144,11 @@ const MainForm = () => {
margin="normal" margin="normal"
inputProps={{ inputProps={{
maxLength: "255", maxLength: "255",
readOnly: true,
}} }}
disabled
value={name} value={name}
required required
fullWidth fullWidth
onChange={onNameChange}
/> />
<FormLabel id="demo-row-radio-buttons-group-label">Log Level</FormLabel> <FormLabel id="demo-row-radio-buttons-group-label">Log Level</FormLabel>
<RadioGroup <RadioGroup