mirror of
https://github.com/lukaszraczylo/kportal.git
synced 2026-06-06 23:13:39 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a297ba7073 | |||
| 518879dc56 | |||
| 649227b201 | |||
| 28e2fc315a |
+1
-1
@@ -56,7 +56,7 @@ release:
|
||||
brews:
|
||||
- repository:
|
||||
owner: lukaszraczylo
|
||||
name: brew-taps
|
||||
name: homebrew-taps
|
||||
token: "{{ .Env.HOMEBREW_TAP_TOKEN }}"
|
||||
directory: Formula
|
||||
homepage: https://lukaszraczylo.github.io/kportal
|
||||
|
||||
@@ -57,7 +57,7 @@ kportal manages multiple Kubernetes port-forwards with an interactive terminal i
|
||||
### Homebrew (macOS/Linux)
|
||||
|
||||
```bash
|
||||
brew install lukaszraczylo/brew-taps/kportal
|
||||
brew install lukaszraczylo/taps/kportal
|
||||
```
|
||||
|
||||
### Quick Install
|
||||
|
||||
+46
-4
@@ -1,6 +1,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
@@ -49,6 +50,23 @@ var (
|
||||
appVersion = "0.1.0" // Set via ldflags during build
|
||||
)
|
||||
|
||||
// promptCreateConfig asks the user if they want to create a new config file.
|
||||
// Returns true if the user answers yes, false otherwise.
|
||||
func promptCreateConfig(path string) bool {
|
||||
fmt.Printf("Configuration file not found: %s\n", path)
|
||||
fmt.Print("Would you like to create an empty configuration? [Y/n] ")
|
||||
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
response, err := reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
response = strings.TrimSpace(strings.ToLower(response))
|
||||
// Empty response (just Enter) defaults to yes
|
||||
return response == "" || response == "y" || response == "yes"
|
||||
}
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
|
||||
@@ -173,14 +191,38 @@ func main() {
|
||||
|
||||
// Load configuration
|
||||
cfg, err := config.LoadConfig(*configFile)
|
||||
configIsNew := false
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err)
|
||||
os.Exit(1)
|
||||
if err == config.ErrConfigNotFound {
|
||||
// Config file doesn't exist - offer to create it
|
||||
if !promptCreateConfig(*configFile) {
|
||||
os.Exit(0)
|
||||
}
|
||||
// Create empty config file
|
||||
if err := config.CreateEmptyConfigFile(*configFile); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error creating config file: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
fmt.Printf("Created %s\n", *configFile)
|
||||
fmt.Println("Use 'n' in the UI to add port forwards, or edit the file manually.")
|
||||
fmt.Println()
|
||||
|
||||
// Load the newly created config
|
||||
cfg, err = config.LoadConfig(*configFile)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
configIsNew = true
|
||||
} else {
|
||||
fmt.Fprintf(os.Stderr, "Error loading config: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate configuration
|
||||
// Validate configuration (allow empty configs for newly created files)
|
||||
validator := config.NewValidator()
|
||||
if errs := validator.ValidateConfig(cfg); len(errs) > 0 {
|
||||
if errs := validator.ValidateConfigWithOptions(cfg, configIsNew || cfg.IsEmpty()); len(errs) > 0 {
|
||||
fmt.Fprint(os.Stderr, config.FormatValidationErrors(errs))
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
kportal.raczylo.com
|
||||
+2
-2
@@ -559,8 +559,8 @@
|
||||
<p class="text-gray-600 dark:text-gray-400 text-sm">macOS & Linux</p>
|
||||
</div>
|
||||
</div>
|
||||
<div onclick="copyToClipboard('brew install lukaszraczylo/brew-taps/kportal', this)" class="relative bg-gradient-to-br from-gray-900 to-gray-800 dark:from-gray-950 dark:to-black text-gray-100 p-4 rounded-lg text-sm cursor-pointer group overflow-x-auto border border-gray-700 hover:border-orange-500 transition-all duration-300">
|
||||
<code class="block whitespace-nowrap font-mono">brew install lukaszraczylo/brew-taps/kportal</code>
|
||||
<div onclick="copyToClipboard('brew install lukaszraczylo/taps/kportal', this)" class="relative bg-gradient-to-br from-gray-900 to-gray-800 dark:from-gray-950 dark:to-black text-gray-100 p-4 rounded-lg text-sm cursor-pointer group overflow-x-auto border border-gray-700 hover:border-orange-500 transition-all duration-300">
|
||||
<code class="block whitespace-nowrap font-mono">brew install lukaszraczylo/taps/kportal</code>
|
||||
<div class="absolute top-3 right-3"><i class="fas fa-copy text-gray-500 group-hover:text-orange-400 transition-colors duration-300"></i></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,6 +2,7 @@ package config
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
@@ -10,6 +11,9 @@ import (
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
// ErrConfigNotFound is returned when the configuration file does not exist
|
||||
var ErrConfigNotFound = fmt.Errorf("config file not found")
|
||||
|
||||
const (
|
||||
// maxConfigSize is the maximum allowed configuration file size (10MB)
|
||||
maxConfigSize = 10 * 1024 * 1024
|
||||
@@ -282,6 +286,9 @@ func LoadConfig(path string) (*Config, error) {
|
||||
// Validate file size before reading
|
||||
fileInfo, err := os.Stat(path)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return nil, ErrConfigNotFound
|
||||
}
|
||||
return nil, fmt.Errorf("failed to stat config file: %w", err)
|
||||
}
|
||||
|
||||
@@ -337,3 +344,58 @@ func (c *Config) GetAllForwards() []Forward {
|
||||
|
||||
return forwards
|
||||
}
|
||||
|
||||
// NewEmptyConfig returns a minimal empty configuration with no forwards.
|
||||
// This is used when creating a new config file for the first time.
|
||||
func NewEmptyConfig() *Config {
|
||||
return &Config{
|
||||
Contexts: []Context{},
|
||||
}
|
||||
}
|
||||
|
||||
// IsEmpty returns true if the configuration has no forwards defined.
|
||||
func (c *Config) IsEmpty() bool {
|
||||
return len(c.Contexts) == 0 || len(c.GetAllForwards()) == 0
|
||||
}
|
||||
|
||||
// CreateEmptyConfigFile creates a new empty configuration file at the given path.
|
||||
// Returns an error if the file already exists or cannot be created.
|
||||
func CreateEmptyConfigFile(path string) error {
|
||||
// Check if file already exists
|
||||
if _, err := os.Stat(path); err == nil {
|
||||
return fmt.Errorf("config file already exists: %s", path)
|
||||
} else if !errors.Is(err, os.ErrNotExist) {
|
||||
return fmt.Errorf("failed to check config file: %w", err)
|
||||
}
|
||||
|
||||
cfg := NewEmptyConfig()
|
||||
data, err := yaml.Marshal(cfg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshal empty config: %w", err)
|
||||
}
|
||||
|
||||
// Add a helpful comment header
|
||||
header := `# kportal configuration file
|
||||
# Add port forwards using the 'n' key in the TUI, or manually add them below.
|
||||
#
|
||||
# Example forward:
|
||||
# contexts:
|
||||
# - name: my-cluster
|
||||
# namespaces:
|
||||
# - name: default
|
||||
# forwards:
|
||||
# - resource: service/my-service
|
||||
# protocol: tcp
|
||||
# port: 8080
|
||||
# localPort: 8080
|
||||
#
|
||||
`
|
||||
content := header + string(data)
|
||||
|
||||
// Write with restrictive permissions (0600)
|
||||
if err := os.WriteFile(path, []byte(content), 0600); err != nil {
|
||||
return fmt.Errorf("failed to write config file: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ func TestLoadConfig_FileNotFound(t *testing.T) {
|
||||
cfg, err := LoadConfig("/non/existent/path/.kportal.yaml")
|
||||
assert.Error(t, err, "LoadConfig should fail with non-existent file")
|
||||
assert.Nil(t, cfg, "config should be nil on error")
|
||||
assert.Contains(t, err.Error(), "failed to stat config file", "error should mention stat failure")
|
||||
assert.Equal(t, ErrConfigNotFound, err, "should return ErrConfigNotFound")
|
||||
}
|
||||
|
||||
func TestForward_ID(t *testing.T) {
|
||||
@@ -397,3 +397,123 @@ func TestHTTPLogSpec_UnmarshalYAML(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewEmptyConfig(t *testing.T) {
|
||||
cfg := NewEmptyConfig()
|
||||
assert.NotNil(t, cfg, "NewEmptyConfig should return non-nil config")
|
||||
assert.Empty(t, cfg.Contexts, "NewEmptyConfig should have empty contexts")
|
||||
assert.True(t, cfg.IsEmpty(), "NewEmptyConfig should be considered empty")
|
||||
}
|
||||
|
||||
func TestConfig_IsEmpty(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
config *Config
|
||||
expected bool
|
||||
}{
|
||||
{
|
||||
name: "nil contexts",
|
||||
config: &Config{},
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
name: "empty contexts slice",
|
||||
config: &Config{Contexts: []Context{}},
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
name: "context with empty namespaces",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{Name: "test", Namespaces: []Namespace{}},
|
||||
},
|
||||
},
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
name: "context with namespace but no forwards",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{
|
||||
Name: "test",
|
||||
Namespaces: []Namespace{
|
||||
{Name: "default", Forwards: []Forward{}},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
name: "config with forward",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{
|
||||
Name: "test",
|
||||
Namespaces: []Namespace{
|
||||
{
|
||||
Name: "default",
|
||||
Forwards: []Forward{
|
||||
{Resource: "pod/app", Port: 8080, LocalPort: 8080},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assert.Equal(t, tt.expected, tt.config.IsEmpty())
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateEmptyConfigFile(t *testing.T) {
|
||||
tmpDir := t.TempDir()
|
||||
configPath := filepath.Join(tmpDir, ".kportal.yaml")
|
||||
|
||||
// Create empty config file
|
||||
err := CreateEmptyConfigFile(configPath)
|
||||
assert.NoError(t, err, "CreateEmptyConfigFile should succeed")
|
||||
|
||||
// Verify file exists
|
||||
_, err = os.Stat(configPath)
|
||||
assert.NoError(t, err, "config file should exist")
|
||||
|
||||
// Verify file is readable and parseable
|
||||
cfg, err := LoadConfig(configPath)
|
||||
assert.NoError(t, err, "should be able to load created config")
|
||||
assert.NotNil(t, cfg, "config should not be nil")
|
||||
assert.True(t, cfg.IsEmpty(), "created config should be empty")
|
||||
|
||||
// Verify file permissions (0600)
|
||||
info, _ := os.Stat(configPath)
|
||||
assert.Equal(t, os.FileMode(0600), info.Mode().Perm(), "file should have 0600 permissions")
|
||||
|
||||
// Verify file contains helpful header
|
||||
content, _ := os.ReadFile(configPath)
|
||||
assert.Contains(t, string(content), "# kportal configuration file", "should contain header comment")
|
||||
assert.Contains(t, string(content), "Example forward", "should contain example")
|
||||
}
|
||||
|
||||
func TestCreateEmptyConfigFile_AlreadyExists(t *testing.T) {
|
||||
tmpDir := t.TempDir()
|
||||
configPath := filepath.Join(tmpDir, ".kportal.yaml")
|
||||
|
||||
// Create existing file
|
||||
err := os.WriteFile(configPath, []byte("existing content"), 0644)
|
||||
assert.NoError(t, err)
|
||||
|
||||
// Try to create config file - should fail
|
||||
err = CreateEmptyConfigFile(configPath)
|
||||
assert.Error(t, err, "CreateEmptyConfigFile should fail when file exists")
|
||||
assert.Contains(t, err.Error(), "already exists")
|
||||
|
||||
// Verify original content is preserved
|
||||
content, _ := os.ReadFile(configPath)
|
||||
assert.Equal(t, "existing content", string(content))
|
||||
}
|
||||
|
||||
@@ -37,6 +37,13 @@ func NewValidator() *Validator {
|
||||
|
||||
// ValidateConfig validates the entire configuration and returns all errors found.
|
||||
func (v *Validator) ValidateConfig(cfg *Config) []ValidationError {
|
||||
return v.ValidateConfigWithOptions(cfg, false)
|
||||
}
|
||||
|
||||
// ValidateConfigWithOptions validates configuration with configurable strictness.
|
||||
// When allowEmpty is true, empty configurations (no contexts/forwards) are allowed.
|
||||
// This is useful for newly created config files where the user will add forwards via the TUI.
|
||||
func (v *Validator) ValidateConfigWithOptions(cfg *Config, allowEmpty bool) []ValidationError {
|
||||
var errs []ValidationError
|
||||
|
||||
if cfg == nil {
|
||||
@@ -46,6 +53,12 @@ func (v *Validator) ValidateConfig(cfg *Config) []ValidationError {
|
||||
}}
|
||||
}
|
||||
|
||||
// If empty configs are allowed and this config is empty, skip structure validation
|
||||
if allowEmpty && cfg.IsEmpty() {
|
||||
// Still validate health check and reliability if present (they don't require forwards)
|
||||
return errs
|
||||
}
|
||||
|
||||
// Validate structure
|
||||
errs = append(errs, v.validateStructure(cfg)...)
|
||||
|
||||
|
||||
@@ -972,3 +972,141 @@ func TestIsAlphanumeric(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidator_ValidateConfigWithOptions(t *testing.T) {
|
||||
validator := NewValidator()
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
config *Config
|
||||
allowEmpty bool
|
||||
expectErrors bool
|
||||
}{
|
||||
{
|
||||
name: "empty config - strict mode",
|
||||
config: &Config{Contexts: []Context{}},
|
||||
allowEmpty: false,
|
||||
expectErrors: true,
|
||||
},
|
||||
{
|
||||
name: "empty config - allow empty",
|
||||
config: &Config{Contexts: []Context{}},
|
||||
allowEmpty: true,
|
||||
expectErrors: false,
|
||||
},
|
||||
{
|
||||
name: "nil contexts - allow empty",
|
||||
config: &Config{},
|
||||
allowEmpty: true,
|
||||
expectErrors: false,
|
||||
},
|
||||
{
|
||||
name: "context with no forwards - allow empty",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{
|
||||
Name: "dev",
|
||||
Namespaces: []Namespace{
|
||||
{Name: "default", Forwards: []Forward{}},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
allowEmpty: true,
|
||||
expectErrors: false,
|
||||
},
|
||||
{
|
||||
name: "valid config - strict mode",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{
|
||||
Name: "dev-cluster",
|
||||
Namespaces: []Namespace{
|
||||
{
|
||||
Name: "default",
|
||||
Forwards: []Forward{
|
||||
{
|
||||
Resource: "pod/my-app",
|
||||
Protocol: "tcp",
|
||||
Port: 8080,
|
||||
LocalPort: 8080,
|
||||
contextName: "dev-cluster",
|
||||
namespaceName: "default",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
allowEmpty: false,
|
||||
expectErrors: false,
|
||||
},
|
||||
{
|
||||
name: "valid config - allow empty (should still validate)",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{
|
||||
Name: "dev-cluster",
|
||||
Namespaces: []Namespace{
|
||||
{
|
||||
Name: "default",
|
||||
Forwards: []Forward{
|
||||
{
|
||||
Resource: "pod/my-app",
|
||||
Protocol: "tcp",
|
||||
Port: 8080,
|
||||
LocalPort: 8080,
|
||||
contextName: "dev-cluster",
|
||||
namespaceName: "default",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
allowEmpty: true,
|
||||
expectErrors: false,
|
||||
},
|
||||
{
|
||||
name: "invalid forward in non-empty config - allow empty still validates",
|
||||
config: &Config{
|
||||
Contexts: []Context{
|
||||
{
|
||||
Name: "dev-cluster",
|
||||
Namespaces: []Namespace{
|
||||
{
|
||||
Name: "default",
|
||||
Forwards: []Forward{
|
||||
{
|
||||
Resource: "pod/my-app",
|
||||
Protocol: "tcp",
|
||||
Port: 0, // Invalid port
|
||||
LocalPort: 8080,
|
||||
contextName: "dev-cluster",
|
||||
namespaceName: "default",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
allowEmpty: true,
|
||||
expectErrors: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
errs := validator.ValidateConfigWithOptions(tt.config, tt.allowEmpty)
|
||||
|
||||
if tt.expectErrors {
|
||||
assert.NotEmpty(t, errs, "expected validation errors")
|
||||
} else {
|
||||
assert.Empty(t, errs, "expected no validation errors, got: %v", errs)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,8 +169,10 @@ func (m *Manager) Start(cfg *config.Config) error {
|
||||
// Get all forwards from config
|
||||
forwards := cfg.GetAllForwards()
|
||||
|
||||
// Empty config is valid - user can add forwards later via TUI
|
||||
if len(forwards) == 0 {
|
||||
return fmt.Errorf("no forwards configured")
|
||||
log.Printf("No forwards configured - use 'n' to add forwards")
|
||||
return nil
|
||||
}
|
||||
|
||||
// Check port availability before starting
|
||||
|
||||
@@ -124,8 +124,8 @@ func TestManager_Start_EmptyForwards(t *testing.T) {
|
||||
|
||||
cfg := &config.Config{}
|
||||
err = manager.Start(cfg)
|
||||
assert.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "no forwards configured")
|
||||
// Empty config is now valid - allows users to add forwards via TUI
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
// TestManager_Reload_NilConfig tests reloading with nil config
|
||||
|
||||
+82
-15
@@ -602,20 +602,82 @@ func (m model) renderMainView() string {
|
||||
footerStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("240"))
|
||||
keyStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("220"))
|
||||
|
||||
footer := fmt.Sprintf("%s/%s: Navigate %s: Toggle %s: New %s: Edit %s: Delete %s: Bench %s: Logs %s: Quit │ Total: %d",
|
||||
keyStyle.Render("↑↓"),
|
||||
keyStyle.Render("jk"),
|
||||
keyStyle.Render("Space"),
|
||||
keyStyle.Render("n"),
|
||||
keyStyle.Render("e"),
|
||||
keyStyle.Render("d"),
|
||||
keyStyle.Render("b"),
|
||||
keyStyle.Render("l"),
|
||||
keyStyle.Render("q"),
|
||||
len(m.ui.forwardOrder))
|
||||
// Get terminal width for footer wrapping
|
||||
termWidth := m.termWidth
|
||||
if termWidth == 0 {
|
||||
termWidth = 120
|
||||
}
|
||||
|
||||
// Fill space to push footer to bottom (reserve 2 lines: 1 for spacing, 1 for footer)
|
||||
footerHeight := 2
|
||||
// Define key bindings as structured data for flexible rendering
|
||||
type keyBinding struct {
|
||||
key string
|
||||
desc string
|
||||
}
|
||||
bindings := []keyBinding{
|
||||
{"↑↓/jk", "Navigate"},
|
||||
{"Space", "Toggle"},
|
||||
{"n", "New"},
|
||||
{"e", "Edit"},
|
||||
{"d", "Delete"},
|
||||
{"b", "Bench"},
|
||||
{"l", "Logs"},
|
||||
{"q", "Quit"},
|
||||
}
|
||||
|
||||
// Build footer lines that fit within terminal width
|
||||
var footerLines []string
|
||||
var currentLine strings.Builder
|
||||
currentLineVisualLen := 0
|
||||
|
||||
// Calculate how much space we need for the total count suffix
|
||||
totalSuffix := fmt.Sprintf(" │ Total: %d", len(m.ui.forwardOrder))
|
||||
totalSuffixLen := len(totalSuffix)
|
||||
|
||||
// Available width (account for some margin)
|
||||
availableWidth := termWidth - 4
|
||||
|
||||
for i, binding := range bindings {
|
||||
// Build this binding's text
|
||||
keyRendered := keyStyle.Render(binding.key)
|
||||
bindingText := keyRendered + ": " + binding.desc
|
||||
// Visual length without ANSI codes
|
||||
bindingVisualLen := len(binding.key) + 2 + len(binding.desc)
|
||||
|
||||
// Add separator if not first item on line
|
||||
separator := ""
|
||||
separatorLen := 0
|
||||
if currentLine.Len() > 0 {
|
||||
separator = " "
|
||||
separatorLen = 2
|
||||
}
|
||||
|
||||
// Check if this binding fits on current line
|
||||
// For the last binding, also need to fit the total suffix
|
||||
neededWidth := currentLineVisualLen + separatorLen + bindingVisualLen
|
||||
if i == len(bindings)-1 {
|
||||
neededWidth += totalSuffixLen
|
||||
}
|
||||
|
||||
if neededWidth > availableWidth && currentLine.Len() > 0 {
|
||||
// Start a new line
|
||||
footerLines = append(footerLines, currentLine.String())
|
||||
currentLine.Reset()
|
||||
currentLineVisualLen = 0
|
||||
separator = ""
|
||||
separatorLen = 0
|
||||
}
|
||||
|
||||
currentLine.WriteString(separator)
|
||||
currentLine.WriteString(bindingText)
|
||||
currentLineVisualLen += separatorLen + bindingVisualLen
|
||||
}
|
||||
|
||||
// Add total count to the last line
|
||||
currentLine.WriteString(totalSuffix)
|
||||
footerLines = append(footerLines, currentLine.String())
|
||||
|
||||
// Calculate footer height
|
||||
footerHeight := len(footerLines) + 1 // +1 for the blank line before footer
|
||||
remainingLines := termHeight - currentLines - footerHeight
|
||||
if remainingLines > 0 {
|
||||
b.WriteString(strings.Repeat("\n", remainingLines))
|
||||
@@ -623,7 +685,12 @@ func (m model) renderMainView() string {
|
||||
|
||||
// Add footer at bottom
|
||||
b.WriteString("\n")
|
||||
b.WriteString(footerStyle.Render(footer))
|
||||
for i, line := range footerLines {
|
||||
if i > 0 {
|
||||
b.WriteString("\n")
|
||||
}
|
||||
b.WriteString(footerStyle.Render(line))
|
||||
}
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -736,7 +803,7 @@ func (m model) renderDeleteConfirmation() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString(helpStyle.Render("←/→: Navigate Enter: Confirm Esc: Cancel"))
|
||||
b.WriteString(wrapHelpText("←/→: Navigate Enter: Confirm Esc: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
// Wrap in a box using wizard style
|
||||
boxStyle := lipgloss.NewStyle().
|
||||
|
||||
@@ -194,6 +194,96 @@ func renderTextInput(label, value string, valid bool) string {
|
||||
return b.String()
|
||||
}
|
||||
|
||||
// wizardHelpWidth returns an appropriate width for wizard help text
|
||||
// based on terminal width. For modals, we use a sensible maximum.
|
||||
func wizardHelpWidth(termWidth int) int {
|
||||
if termWidth == 0 {
|
||||
termWidth = 80
|
||||
}
|
||||
// Wizard modals shouldn't be wider than 70 chars typically
|
||||
// but on narrow terminals, use available space minus padding
|
||||
maxWidth := 70
|
||||
available := termWidth - 10 // account for modal borders and padding
|
||||
if available < maxWidth {
|
||||
return available
|
||||
}
|
||||
return maxWidth
|
||||
}
|
||||
|
||||
// wrapHelpText wraps help text to fit within the given width.
|
||||
// Help text is expected to be in the format "key: action key: action ..."
|
||||
// separated by double spaces. On smaller screens, it wraps to multiple lines.
|
||||
func wrapHelpText(text string, width int) string {
|
||||
if width <= 0 {
|
||||
width = 80 // Default width
|
||||
}
|
||||
|
||||
// Account for some padding/margin
|
||||
availableWidth := width - 4
|
||||
if availableWidth < 20 {
|
||||
availableWidth = 20
|
||||
}
|
||||
|
||||
// If text fits, return as-is
|
||||
if len(text) <= availableWidth {
|
||||
return helpStyle.Render(text)
|
||||
}
|
||||
|
||||
// Split by double-space separator (common in help text)
|
||||
parts := strings.Split(text, " ")
|
||||
if len(parts) <= 1 {
|
||||
// No double-space separators, just truncate
|
||||
if len(text) > availableWidth-3 {
|
||||
return helpStyle.Render(text[:availableWidth-3] + "...")
|
||||
}
|
||||
return helpStyle.Render(text)
|
||||
}
|
||||
|
||||
var lines []string
|
||||
var currentLine strings.Builder
|
||||
|
||||
for i, part := range parts {
|
||||
part = strings.TrimSpace(part)
|
||||
if part == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
// Check if adding this part would exceed width
|
||||
addition := part
|
||||
if currentLine.Len() > 0 {
|
||||
addition = " " + part
|
||||
}
|
||||
|
||||
if currentLine.Len()+len(addition) > availableWidth && currentLine.Len() > 0 {
|
||||
// Start new line
|
||||
lines = append(lines, currentLine.String())
|
||||
currentLine.Reset()
|
||||
currentLine.WriteString(part)
|
||||
} else {
|
||||
if currentLine.Len() > 0 {
|
||||
currentLine.WriteString(" ")
|
||||
}
|
||||
currentLine.WriteString(part)
|
||||
}
|
||||
|
||||
// Handle last part
|
||||
if i == len(parts)-1 && currentLine.Len() > 0 {
|
||||
lines = append(lines, currentLine.String())
|
||||
}
|
||||
}
|
||||
|
||||
// Join with newlines and apply style to each line
|
||||
var result strings.Builder
|
||||
for i, line := range lines {
|
||||
if i > 0 {
|
||||
result.WriteString("\n")
|
||||
}
|
||||
result.WriteString(helpStyle.Render(line))
|
||||
}
|
||||
|
||||
return result.String()
|
||||
}
|
||||
|
||||
// overlayContent overlays modal content centered on the base view
|
||||
// Note: base parameter is kept for API compatibility but not used since
|
||||
// lipgloss.Place provides cleaner centering without background artifacts
|
||||
|
||||
+29
-24
@@ -109,10 +109,11 @@ func (m model) renderSelectContext() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
helpWidth := wizardHelpWidth(m.termWidth)
|
||||
if wizard.searchFilter != "" {
|
||||
b.WriteString(helpStyle.Render(fmt.Sprintf("↑/↓: Navigate Enter: Select Backspace: Clear filter (%d/%d) Esc: Cancel", len(wizard.getFilteredContexts()), len(wizard.contexts))))
|
||||
b.WriteString(wrapHelpText(fmt.Sprintf("↑/↓: Navigate Enter: Select Backspace: Clear filter (%d/%d) Esc: Cancel", len(wizard.getFilteredContexts()), len(wizard.contexts)), helpWidth))
|
||||
} else {
|
||||
b.WriteString(helpStyle.Render("Type to filter ↑/↓: Navigate Enter: Select Esc/Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("Type to filter ↑/↓: Navigate Enter: Select Esc/Ctrl+C: Cancel", helpWidth))
|
||||
}
|
||||
|
||||
return b.String()
|
||||
@@ -150,10 +151,11 @@ func (m model) renderSelectNamespace() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
helpWidth := wizardHelpWidth(m.termWidth)
|
||||
if wizard.searchFilter != "" {
|
||||
b.WriteString(helpStyle.Render(fmt.Sprintf("↑/↓: Navigate Enter: Select Backspace: Clear filter (%d/%d) Esc: Back", len(wizard.getFilteredNamespaces()), len(wizard.namespaces))))
|
||||
b.WriteString(wrapHelpText(fmt.Sprintf("↑/↓: Navigate Enter: Select Backspace: Clear filter (%d/%d) Esc: Back", len(wizard.getFilteredNamespaces()), len(wizard.namespaces)), helpWidth))
|
||||
} else {
|
||||
b.WriteString(helpStyle.Render("Type to filter ↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("Type to filter ↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel", helpWidth))
|
||||
}
|
||||
|
||||
return b.String()
|
||||
@@ -192,7 +194,7 @@ func (m model) renderSelectResourceType() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -305,14 +307,15 @@ func (m model) renderEnterResource() string {
|
||||
|
||||
b.WriteString("\n")
|
||||
// Show appropriate help text based on resource type and filter state
|
||||
helpWidth := wizardHelpWidth(m.termWidth)
|
||||
if wizard.selectedResourceType == ResourceTypeService {
|
||||
if wizard.searchFilter != "" {
|
||||
b.WriteString(helpStyle.Render(fmt.Sprintf("↑/↓: Navigate Enter: Select Backspace: Clear filter (%d/%d) Esc: Back", len(wizard.getFilteredServices()), len(wizard.services))))
|
||||
b.WriteString(wrapHelpText(fmt.Sprintf("↑/↓: Navigate Enter: Select Backspace: Clear filter (%d/%d) Esc: Back", len(wizard.getFilteredServices()), len(wizard.services)), helpWidth))
|
||||
} else {
|
||||
b.WriteString(helpStyle.Render("Type to filter ↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("Type to filter ↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel", helpWidth))
|
||||
}
|
||||
} else {
|
||||
b.WriteString(helpStyle.Render("Enter: Continue Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("Enter: Continue Esc: Back Ctrl+C: Cancel", helpWidth))
|
||||
}
|
||||
|
||||
return b.String()
|
||||
@@ -403,7 +406,7 @@ func (m model) renderEnterRemotePort() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("↑/↓: Navigate Enter: Select Esc: Back Ctrl+C: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
} else {
|
||||
// Text input mode (no detected ports or user chose manual entry)
|
||||
if len(wizard.detectedPorts) > 0 {
|
||||
@@ -436,7 +439,7 @@ func (m model) renderEnterRemotePort() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("Enter: Continue Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("Enter: Continue Esc: Back Ctrl+C: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
}
|
||||
|
||||
return b.String()
|
||||
@@ -477,7 +480,7 @@ func (m model) renderEnterLocalPort() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("Enter: Continue Esc: Back Ctrl+C: Cancel"))
|
||||
b.WriteString(wrapHelpText("Enter: Continue Esc: Back Ctrl+C: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -535,7 +538,7 @@ func (m model) renderConfirmation() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("↑/↓/Tab: Navigate Enter: Confirm Esc: Back"))
|
||||
b.WriteString(wrapHelpText("↑/↓/Tab: Navigate Enter: Confirm Esc: Back", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -578,7 +581,7 @@ func (m model) renderSuccess() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("↑/↓: Navigate Enter: Select"))
|
||||
b.WriteString(wrapHelpText("↑/↓: Navigate Enter: Select", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -641,7 +644,7 @@ func (m model) renderRemoveSelection() string {
|
||||
selectedCount := wizard.getSelectedCount()
|
||||
b.WriteString(fmt.Sprintf("%d of %d selected\n\n", selectedCount, len(wizard.forwards)))
|
||||
|
||||
b.WriteString(helpStyle.Render("Space: Toggle a: All n: None Enter: Remove Esc: Cancel"))
|
||||
b.WriteString(wrapHelpText("Space: Toggle a: All n: None Enter: Remove Esc: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -676,7 +679,7 @@ func (m model) renderRemoveConfirmation() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("↑/↓: Navigate Enter: Confirm Esc: Cancel"))
|
||||
b.WriteString(wrapHelpText("↑/↓: Navigate Enter: Confirm Esc: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -740,7 +743,7 @@ func (m model) renderBenchmarkConfig() string {
|
||||
b.WriteString("\n")
|
||||
b.WriteString(mutedStyle.Render(fmt.Sprintf("Will send %d requests with %d concurrent workers", state.requests, state.concurrency)))
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString(helpStyle.Render("↑/↓/Tab: Navigate Type to edit Enter: Run Esc: Cancel"))
|
||||
b.WriteString(wrapHelpText("↑/↓/Tab: Navigate Type to edit Enter: Run Esc: Cancel", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -780,7 +783,7 @@ func (m model) renderBenchmarkRunning() string {
|
||||
b.WriteString(mutedStyle.Render(fmt.Sprintf("Method: %s Concurrency: %d", state.method, state.concurrency)))
|
||||
b.WriteString("\n\n")
|
||||
|
||||
b.WriteString(helpStyle.Render("Please wait..."))
|
||||
b.WriteString(wrapHelpText("Please wait...", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -796,14 +799,14 @@ func (m model) renderBenchmarkResults() string {
|
||||
if state.error != nil {
|
||||
b.WriteString(errorStyle.Render(fmt.Sprintf("✗ Error: %v", state.error)))
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString(helpStyle.Render("Press Enter or Esc to return"))
|
||||
b.WriteString(wrapHelpText("Press Enter or Esc to return", wizardHelpWidth(m.termWidth)))
|
||||
return b.String()
|
||||
}
|
||||
|
||||
if state.results == nil {
|
||||
b.WriteString(mutedStyle.Render("No results available"))
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString(helpStyle.Render("Press Enter or Esc to return"))
|
||||
b.WriteString(wrapHelpText("Press Enter or Esc to return", wizardHelpWidth(m.termWidth)))
|
||||
return b.String()
|
||||
}
|
||||
|
||||
@@ -872,7 +875,7 @@ func (m model) renderBenchmarkResults() string {
|
||||
}
|
||||
|
||||
b.WriteString("\n")
|
||||
b.WriteString(helpStyle.Render("Press Enter or Esc to return"))
|
||||
b.WriteString(wrapHelpText("Press Enter or Esc to return", wizardHelpWidth(m.termWidth)))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -1076,8 +1079,10 @@ func (m model) renderHTTPLog() string {
|
||||
}
|
||||
b.WriteString("\n")
|
||||
|
||||
// Help line at bottom
|
||||
b.WriteString(helpStyle.Render(" ↑/↓: Navigate Enter: Details a: Auto-scroll f: Filter /: Search c: Clear q: Close"))
|
||||
// Help line at bottom (wrap for smaller screens)
|
||||
helpText := "↑/↓: Navigate Enter: Details a: Auto-scroll f: Filter /: Search c: Clear q: Close"
|
||||
b.WriteString(" ")
|
||||
b.WriteString(wrapHelpText(helpText, termWidth-4))
|
||||
|
||||
return b.String()
|
||||
}
|
||||
@@ -1273,9 +1278,9 @@ func (m model) renderHTTPLogDetail(entry HTTPLogEntry, termWidth, termHeight int
|
||||
if state.copyMessage != "" {
|
||||
b.WriteString(successStyle.Render(state.copyMessage))
|
||||
b.WriteString(" ")
|
||||
b.WriteString(helpStyle.Render("↑/↓: Scroll c: Copy Esc: Back"))
|
||||
b.WriteString(wrapHelpText("↑/↓: Scroll c: Copy Esc: Back", termWidth-10))
|
||||
} else {
|
||||
b.WriteString(helpStyle.Render("↑/↓/PgUp/PgDn: Scroll g: Top c: Copy response Esc: Back"))
|
||||
b.WriteString(wrapHelpText("↑/↓/PgUp/PgDn: Scroll g: Top c: Copy response Esc: Back", termWidth-10))
|
||||
}
|
||||
|
||||
return b.String()
|
||||
|
||||
Reference in New Issue
Block a user