From e59eda8701f28238eb6c6ddffc3fbef313045a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=9Al=C4=99zak?= <fslezak@teonite.com>
Date: Tue, 9 Sep 2025 11:28:59 +0200
Subject: [PATCH] fix network device edit form

---
 .../AddDeviceSetupMethodStep.tsx              |  1 -
 .../StandaloneDeviceModalForm.tsx             | 81 ++++++++++---------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/web/src/pages/addDevice/steps/AddDeviceSetupMethodStep/AddDeviceSetupMethodStep.tsx b/web/src/pages/addDevice/steps/AddDeviceSetupMethodStep/AddDeviceSetupMethodStep.tsx
index ab47ec6d77..26aa2eb03f 100644
--- a/web/src/pages/addDevice/steps/AddDeviceSetupMethodStep/AddDeviceSetupMethodStep.tsx
+++ b/web/src/pages/addDevice/steps/AddDeviceSetupMethodStep/AddDeviceSetupMethodStep.tsx
@@ -53,7 +53,6 @@ export const AddDeviceSetupMethodStep = () => {
 
   useEffect(() => {
     const sub = navSubject.subscribe((event) => {
-      console.log(event);
       if (event === AddDeviceNavigationEvent.NEXT) {
         switch (setupMethod) {
           case AddDeviceStep.NATIVE_CHOOSE_METHOD:
diff --git a/web/src/pages/devices/modals/components/StandaloneDeviceModalForm/StandaloneDeviceModalForm.tsx b/web/src/pages/devices/modals/components/StandaloneDeviceModalForm/StandaloneDeviceModalForm.tsx
index 113df082ab..acc2c31a7f 100644
--- a/web/src/pages/devices/modals/components/StandaloneDeviceModalForm/StandaloneDeviceModalForm.tsx
+++ b/web/src/pages/devices/modals/components/StandaloneDeviceModalForm/StandaloneDeviceModalForm.tsx
@@ -125,49 +125,54 @@ export const StandaloneDeviceModalForm = ({
 
   const submitHandler: SubmitHandler<StandaloneDeviceFormFields> = async (formValues) => {
     const values = formValues;
-    const { modifiableIpParts: modifiableIpPart } = values;
-    values.description = values.description?.trim();
-    values.name = values.name.trim();
-    const currentIpResp = internalRecommendedIps ?? initialIpRecommendation;
-    values.modifiableIpParts = currentIpResp.map(
-      (resp, i) => resp.network_part + formValues.modifiableIpParts[i].trim(),
-    );
-    if (
-      mode === StandaloneDeviceModalFormMode.EDIT &&
-      modifiableIpPart === defaults.modifiableIpParts
-    ) {
-      await onSubmit(values);
-      return;
-    }
-
+    const recommendationResponse = internalRecommendedIps ?? initialIpRecommendation;
+    let validationList = recommendationResponse.map((recommendation, index) => ({
+      ip: recommendation.network_part + formValues.modifiableIpParts[index],
+      index,
+    }));
+    values.modifiableIpParts = validationList.map((item) => item.ip);
     // try to validate explicitly chosen IPs before submission
     let validationErrors = false;
-    try {
-      const response = await validateLocationIp({
-        ips: values.modifiableIpParts,
-        location: values.location_id,
-      });
 
-      response.forEach(({ available, valid }, index) => {
-        if (!available) {
-          validationErrors = true;
-          setError(`modifiableIpParts.${index}`, {
-            message: LL.form.error.reservedIp(),
-          });
-        }
-        if (!valid) {
-          validationErrors = true;
-          setError(`modifiableIpParts.${index}`, {
-            message: LL.form.error.invalidIp(),
-          });
-        }
-      });
-    } catch (_) {
-      validationErrors = true;
-      toaster.error(LL.messages.error());
+    // if edit exclude initial ip's from validation as they are reserved already by edited device
+    if (mode === StandaloneDeviceModalFormMode.EDIT) {
+      const reservedByDevice = initialIpRecommendation.map(
+        (item) => item.network_part + item.modifiable_part,
+      );
+      validationList = validationList.filter(
+        (item) => !reservedByDevice.includes(item.ip),
+      );
+    }
+
+    if (validationList.length) {
+      try {
+        const response = await validateLocationIp({
+          ips: validationList.map((item) => item.ip),
+          location: values.location_id,
+        });
+
+        response.forEach(({ available, valid }, index) => {
+          const fieldIndex = validationList[index].index;
+          if (!available) {
+            validationErrors = true;
+            setError(`modifiableIpParts.${fieldIndex}`, {
+              message: LL.form.error.reservedIp(),
+            });
+          }
+          if (!valid) {
+            validationErrors = true;
+            setError(`modifiableIpParts.${fieldIndex}`, {
+              message: LL.form.error.invalidIp(),
+            });
+          }
+        });
+      } catch (_) {
+        validationErrors = true;
+        toaster.error(LL.messages.error());
+      }
     }
 
-    // submit form if no validation errors ocurred
+    // submit form if no validation errors occurred
     if (!validationErrors) {
       try {
         await onSubmit(values);