- minor fixe on hotlist
- minor fix on secondary ip address in modem settings
This commit is contained in:
@@ -21,7 +21,7 @@ const HotlistList = () => {
|
|||||||
return (
|
return (
|
||||||
<Card className="p-4">
|
<Card className="p-4">
|
||||||
<CardHeader title="Uploaded hotlists" />
|
<CardHeader title="Uploaded hotlists" />
|
||||||
{hotlists.length > 0 ? (
|
{hotlists?.length > 0 ? (
|
||||||
<ul className="px-2">
|
<ul className="px-2">
|
||||||
{hotlists?.map((hotlist) => (
|
{hotlists?.map((hotlist) => (
|
||||||
<li
|
<li
|
||||||
|
|||||||
@@ -37,41 +37,32 @@ const ModemSettings = () => {
|
|||||||
const handleSubmit = async (values: ModemSettingsType) => {
|
const handleSubmit = async (values: ModemSettingsType) => {
|
||||||
const invalidPrimary = ValidateIPaddress(values.serverPrimary);
|
const invalidPrimary = ValidateIPaddress(values.serverPrimary);
|
||||||
const invalidSecondary = ValidateIPaddress(values.serverSecondary);
|
const invalidSecondary = ValidateIPaddress(values.serverSecondary);
|
||||||
|
|
||||||
if (invalidPrimary || invalidSecondary) {
|
if (invalidPrimary || invalidSecondary) {
|
||||||
toast.error(invalidPrimary || invalidSecondary, {
|
toast.error(invalidPrimary || invalidSecondary, {
|
||||||
id: "invalid-ip",
|
id: "invalid-ip",
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fields = [
|
||||||
|
{ property: "propAPN", value: values.apn },
|
||||||
|
{ property: "propPassword", value: values.password },
|
||||||
|
{ property: "propUsername", value: values.username },
|
||||||
|
{ property: "propMode", value: showSettings ? "AUTO" : "MANUAL" },
|
||||||
|
{ property: "propNameServerPrimary", value: values.serverPrimary },
|
||||||
|
];
|
||||||
|
|
||||||
|
if (values.serverSecondary?.trim()) {
|
||||||
|
fields.push({
|
||||||
|
property: "propNameServerSecondary",
|
||||||
|
value: values.serverSecondary.trim(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const modemConfig = {
|
const modemConfig = {
|
||||||
id: "ModemAndWifiManager-modem",
|
id: "ModemAndWifiManager-modem",
|
||||||
fields: [
|
fields,
|
||||||
{
|
|
||||||
property: "propAPN",
|
|
||||||
value: values.apn,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
property: "propPassword",
|
|
||||||
value: values.password,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
property: "propUsername",
|
|
||||||
value: values.username,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
property: "propMode",
|
|
||||||
value: showSettings ? "AUTO" : "MANUAL",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
property: "propNameServerPrimary",
|
|
||||||
value: values.serverPrimary,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
property: "propNameServerSecondary",
|
|
||||||
value: values.serverSecondary,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const response = await modemMutation.mutateAsync(modemConfig);
|
const response = await modemMutation.mutateAsync(modemConfig);
|
||||||
|
|||||||
Reference in New Issue
Block a user