diff --git a/components/PortForwardingNew.tsx b/components/PortForwardingNew.tsx index bcaf2a369..88ac7f235 100644 --- a/components/PortForwardingNew.tsx +++ b/components/PortForwardingNew.tsx @@ -1,4 +1,5 @@ import React, { useCallback, useMemo, useState } from 'react'; +import { createPortal } from 'react-dom'; import { ArrowLeft, ArrowRight, @@ -187,6 +188,26 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou const [editingRule, setEditingRule] = useState(null); const [editDraft, setEditDraft] = useState>({}); + // New forwarding form mode (skip wizard, all-in-one form) + const [showNewForm, setShowNewForm] = useState(false); + const [newFormDraft, setNewFormDraft] = useState>({ + label: '', + type: 'local', + localPort: undefined, + bindAddress: '127.0.0.1', + remoteHost: '', + remotePort: undefined, + hostId: undefined, + }); + // User preference: skip wizard next time + const [preferFormMode, setPreferFormMode] = useState(() => { + try { + return localStorage.getItem('pf-prefer-form-mode') === 'true'; + } catch { + return false; + } + }); + // New forwarding menu const [showNewMenu, setShowNewMenu] = useState(false); @@ -284,23 +305,120 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou setHostSearchQuery(''); }; - // Start new rule wizard + // Reset new form + const resetNewForm = () => { + setNewFormDraft({ + label: '', + type: 'local', + localPort: undefined, + bindAddress: '127.0.0.1', + remoteHost: '', + remotePort: undefined, + hostId: undefined, + }); + }; + + // Start new rule - wizard or form based on user preference const startNewRule = (type: PortForwardingType) => { - resetWizard(); - setWizardType(type); - setDraftRule(prev => ({ ...prev, type })); - setShowWizard(true); setShowNewMenu(false); - // All types start from 'type' selection step + + if (preferFormMode) { + // Form mode: show all-in-one form + resetNewForm(); + setNewFormDraft(prev => ({ ...prev, type })); + setShowNewForm(true); + setShowWizard(false); + } else { + // Wizard mode + resetWizard(); + setWizardType(type); + setDraftRule(prev => ({ ...prev, type })); + setShowWizard(true); + setShowNewForm(false); + setWizardStep('type'); + } + }; + + // Skip wizard and switch to form mode + const skipWizardToForm = () => { + // Save preference + setPreferFormMode(true); + try { + localStorage.setItem('pf-prefer-form-mode', 'true'); + } catch {} + + // Transfer current draft to form + setNewFormDraft({ + ...draftRule, + type: wizardType, + }); + setShowWizard(false); + setShowNewForm(true); + }; + + // Open wizard from form + const openWizardFromForm = () => { + // Transfer current form draft to wizard + setWizardType(newFormDraft.type || 'local'); + setDraftRule({ ...newFormDraft }); + setShowNewForm(false); + setShowWizard(true); setWizardStep('type'); }; + // Save new rule from form + const saveNewFormRule = () => { + const label = newFormDraft.label?.trim() || (() => { + const host = hosts.find(h => h.id === newFormDraft.hostId); + switch (newFormDraft.type) { + case 'local': + return `Local:${newFormDraft.localPort} → ${newFormDraft.remoteHost}:${newFormDraft.remotePort}`; + case 'remote': + return `Remote:${newFormDraft.localPort} → ${newFormDraft.remoteHost}:${newFormDraft.remotePort}`; + case 'dynamic': + return `SOCKS:${newFormDraft.localPort}`; + default: + return 'New Rule'; + } + })(); + + addRule({ + label, + type: newFormDraft.type || 'local', + localPort: newFormDraft.localPort!, + bindAddress: newFormDraft.bindAddress || '127.0.0.1', + remoteHost: newFormDraft.remoteHost, + remotePort: newFormDraft.remotePort, + hostId: newFormDraft.hostId, + }); + + setShowNewForm(false); + resetNewForm(); + }; + + // Close new form + const closeNewForm = () => { + setShowNewForm(false); + resetNewForm(); + }; + + // Check if new form is valid + const isNewFormValid = (): boolean => { + if (!newFormDraft.localPort || newFormDraft.localPort <= 0 || newFormDraft.localPort >= 65536) return false; + if (!newFormDraft.hostId) return false; + if (newFormDraft.type !== 'dynamic') { + if (!newFormDraft.remoteHost || !newFormDraft.remotePort) return false; + } + return true; + }; + // Edit existing rule - open edit panel const startEditRule = (rule: PortForwardingRule) => { setEditingRule(rule); setEditDraft({ ...rule }); setShowEditPanel(true); - setShowWizard(false); // Close wizard if open + setShowWizard(false); + setShowNewForm(false); }; // Save edited rule @@ -322,6 +440,7 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou }; // Handle wizard navigation + // Flow: type -> config -> destination (local/remote only) -> host-selection const getNextStep = (): WizardStep | null => { switch (wizardStep) { case 'type': @@ -330,15 +449,15 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou if (wizardType === 'remote') return 'remote-config'; return null; case 'local-config': - if (wizardType === 'dynamic') return 'host-selection'; // Dynamic needs host selection after local config + if (wizardType === 'dynamic') return 'host-selection'; if (wizardType === 'local') return 'destination'; return null; case 'remote-config': return 'destination'; case 'destination': - return null; + return 'host-selection'; // Host selection is always last for local/remote case 'host-selection': - return null; // Host selection is the last step for dynamic + return null; default: return null; } @@ -357,7 +476,8 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou if (wizardType === 'remote') return 'remote-config'; return null; case 'host-selection': - return 'local-config'; + if (wizardType === 'dynamic') return 'local-config'; + return 'destination'; default: return null; } @@ -366,9 +486,8 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou const canProceed = (): boolean => { switch (wizardStep) { case 'type': - // Dynamic doesn't need host on type step, others do - if (wizardType === 'dynamic') return true; - return !!draftRule.hostId; + // Type step just shows description, always can proceed + return true; case 'local-config': return !!(draftRule.localPort && draftRule.localPort > 0 && draftRule.localPort < 65536); case 'remote-config': @@ -545,7 +664,13 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou )} - deleteRule(rule.id)}> + { + // Close edit panel if deleting the currently editing rule + if (editingRule?.id === rule.id) { + closeEditPanel(); + } + deleteRule(rule.id); + }}> Delete @@ -589,30 +714,6 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou

{TYPE_DESCRIPTIONS[wizardType]}

- - {/* Host Selection Button */} - {wizardType !== 'dynamic' && ( -
-
- {wizardType === 'local' ? 'Select the SSH tunnel host:' : 'Select the remote host:'} -
- -
- )} ); @@ -720,15 +821,6 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou onChange={e => setDraftRule(prev => ({ ...prev, remotePort: parseInt(e.target.value) || undefined }))} /> -
- - setDraftRule(prev => ({ ...prev, label: e.target.value }))} - /> -
); @@ -760,11 +852,11 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou )} - {/* Rule label for dynamic */} + {/* Rule label */}
setDraftRule(prev => ({ ...prev, label: e.target.value }))} @@ -783,7 +875,7 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou return (
{/* Main Content */} -
+
{/* Toolbar */}
@@ -908,7 +1000,7 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou
{filteredRules.map(rule => renderRuleCard(rule))}
@@ -1067,7 +1159,7 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou @@ -1140,31 +1241,29 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou
)} - {/* Host Selector Overlay - Same width as wizard panel */} - {showHostSelector && ( -
+ {/* Host Selector Overlay - Rendered via Portal to avoid parent CSS issues */} + {showHostSelector && createPortal( +
{/* Header */}
- +

Select Host

{hostSelectorPath || 'Personal vault'}

@@ -1242,7 +1341,8 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou {filteredHosts.map(host => { const isSelectedInWizard = draftRule.hostId === host.id; const isSelectedInEdit = editDraft.hostId === host.id; - const isSelected = showEditPanel ? isSelectedInEdit : isSelectedInWizard; + const isSelectedInNewForm = newFormDraft.hostId === host.id; + const isSelected = showEditPanel ? isSelectedInEdit : (showNewForm ? isSelectedInNewForm : isSelectedInWizard); return (
= ({ hosts, keys, customGrou onClick={() => { if (showEditPanel) { setEditDraft(prev => ({ ...prev, hostId: host.id })); + } else if (showNewForm) { + setNewFormDraft(prev => ({ ...prev, hostId: host.id })); } else { setDraftRule(prev => ({ ...prev, hostId: host.id })); } @@ -1286,7 +1388,7 @@ const PortForwarding: React.FC = ({ hosts, keys, customGrou
+
, + document.body + )} + + {/* New Form Panel (skip wizard mode) */} + {showNewForm && ( +
+ {/* Header */} +
+
+

New Port Forwarding

+

Personal vault

+
+
+ + + + + + + + + +
+
+ + {/* Content */} + +
+ {/* Type Selector */} +
+ {(['local', 'remote', 'dynamic'] as PortForwardingType[]).map((type) => ( + + ))} +
+ + {/* Traffic Diagram */} + + + {/* Label */} +
+ + setNewFormDraft(prev => ({ ...prev, label: e.target.value }))} + /> +
+ + {/* Local Port */} +
+ + setNewFormDraft(prev => ({ ...prev, localPort: parseInt(e.target.value) || undefined }))} + /> +
+ + {/* Bind Address */} +
+ + setNewFormDraft(prev => ({ ...prev, bindAddress: e.target.value }))} + /> +
+ + {/* Intermediate Host */} +
+ + +
+ + {/* Destination - for local/remote only */} + {(newFormDraft.type === 'local' || newFormDraft.type === 'remote') && ( + <> +
+ + setNewFormDraft(prev => ({ ...prev, remoteHost: e.target.value }))} + /> +
+ +
+ + setNewFormDraft(prev => ({ ...prev, remotePort: parseInt(e.target.value) || undefined }))} + /> +
+ + )} +
+
+ + {/* Footer */} +
+ +
+ + +
+
)}