From 5e5754fa6260eb20dcf18c6632472eb091a2ba9e Mon Sep 17 00:00:00 2001
From: Pallavi <pallavilpmt1995@gmail.com>
Date: Mon, 1 Sep 2025 21:22:18 +0530
Subject: [PATCH] preserve port and method on host change

---
 .../resources/[resourceId]/proxy/page.tsx     | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/app/[orgId]/settings/resources/[resourceId]/proxy/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/proxy/page.tsx
index ae831277..5ec16618 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/proxy/page.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/proxy/page.tsx
@@ -649,18 +649,29 @@ export default function ReverseProxyTargets(props: {
                     defaultValue={row.original.ip}
                     className="min-w-[150px]"
                     onBlur={(e) => {
-                        const parsed = parseHostTarget(e.target.value);
-                        if (parsed) {
-                            updateTarget(row.original.targetId, {
-                                ...row.original,
-                                method: parsed.protocol,
-                                ip: parsed.host,
-                                port: parsed.port
-                            });
+                        const input = e.target.value.trim();
+                        const hasProtocol = /^https?:\/\//.test(input);
+                        const hasPort = /:\d+/.test(input);
+
+                        if (hasProtocol || hasPort) {
+                            const parsed = parseHostTarget(input);
+                            if (parsed) {
+                                updateTarget(row.original.targetId, {
+                                    ...row.original,
+                                    method: hasProtocol ? parsed.protocol : row.original.method,
+                                    ip: parsed.host,
+                                    port: hasPort ? parsed.port : row.original.port
+                                });
+                            } else {
+                                updateTarget(row.original.targetId, {
+                                    ...row.original,
+                                    ip: input
+                                });
+                            }
                         } else {
                             updateTarget(row.original.targetId, {
                                 ...row.original,
-                                ip: e.target.value
+                                ip: input
                             });
                         }
                     }}
@@ -961,11 +972,21 @@ export default function ReverseProxyTargets(props: {
                                                         id="ip"
                                                         {...field}
                                                         onBlur={(e) => {
-                                                            const parsed = parseHostTarget(e.target.value);
-                                                            if (parsed) {
-                                                                addTargetForm.setValue("method", parsed.protocol);
-                                                                addTargetForm.setValue("ip", parsed.host);
-                                                                addTargetForm.setValue("port", parsed.port);
+                                                            const input = e.target.value.trim();
+                                                            const hasProtocol = /^https?:\/\//.test(input);
+                                                            const hasPort = /:\d+/.test(input);
+
+                                                            if (hasProtocol || hasPort) {
+                                                                const parsed = parseHostTarget(input);
+                                                                if (parsed) {
+                                                                    if (hasProtocol || !addTargetForm.getValues("method")) {
+                                                                        addTargetForm.setValue("method", parsed.protocol);
+                                                                    }
+                                                                    addTargetForm.setValue("ip", parsed.host);
+                                                                    if (hasPort || !addTargetForm.getValues("port")) {
+                                                                        addTargetForm.setValue("port", parsed.port);
+                                                                    }
+                                                                }
                                                             } else {
                                                                 field.onBlur();
                                                             }