feat(harmonize color on flash banner + add filter not operation ^)

Author: jr-k

internal/ui/app.go

@@ -57,6 +57,9 @@ type App struct {
 
 	flashMx    sync.Mutex
 	flashExpiry time.Time
+	
+	appendTimer *time.Timer
+	appendMx    sync.Mutex
 }
 
 // Ensure App implements AppController interface
@@ -425,17 +428,6 @@ func (a *App) SetFilter(filter string) {
 	a.ActiveFilter = filter
 }
 
-func (a *App) SetFlashText(text string) {
-	a.Flash.SetText(text)
-}
-
-func (a *App) AppendFlash(text string) {
-	a.Flash.Append(text)
-	
-	// Optional: Auto-clear the appended part after delay? 
-	// For now let's keep it simple, it will be cleared on next full refresh
-}
-
 func (a *App) RestoreFocus() {
 	page, _ := a.Pages.GetFrontPage()
 	if view, ok := a.Views[page]; ok {
@@ -548,6 +540,46 @@ func (a *App) IsPaused() bool {
 	return a.paused
 }
 
+
+func (a *App) SetFlashText(text string) {
+	a.flashMx.Lock()
+	a.flashExpiry = time.Now().Add(100 * time.Millisecond) // Short lock to prevent immediate overwrite
+	a.flashMx.Unlock()
+	a.Flash.SetText(text)
+}
+
+func (a *App) AppendFlash(text string) {
+	// No need to lock main flash, as we use a separate slot in FlashComponent.
+	a.appendMx.Lock()
+	defer a.appendMx.Unlock()
+
+	if a.appendTimer != nil {
+		a.appendTimer.Stop()
+	}
+
+	a.Flash.Append(text)
+
+	a.appendTimer = time.AfterFunc(2*time.Second, func() {
+		a.appendMx.Lock()
+		defer a.appendMx.Unlock()
+		a.Flash.ClearAppend()
+		// SafeQueueUpdateDraw handles thread safety for the draw
+		a.SafeQueueUpdateDraw(func() {})
+	})
+}
+
+func  (a *App) AppendFlashError(text string) {
+	a.AppendFlash(fmt.Sprintf("[black:red] <error: %s> [-:-]", text))
+}
+
+func (a *App) AppendFlashPending(text string) {
+	a.AppendFlash(fmt.Sprintf("[black:%s] <pending: %s> [-:-]", styles.ColorIdle, text))
+}
+
+func (a *App) AppendFlashSuccess(text string) {
+	a.AppendFlash(fmt.Sprintf("[black:#50fa7b] <success: %s> [-:-]", text))
+}
+
 func (a *App) SetFlashMessage(text string, duration time.Duration) {
 	a.flashMx.Lock()
 	a.flashExpiry = time.Now().Add(duration)
@@ -556,6 +588,18 @@ func (a *App) SetFlashMessage(text string, duration time.Duration) {
 	a.Flash.SetText(text)
 }
 
+func (a *App) SetFlashError(text string) {
+	a.AppendFlash(fmt.Sprintf("[black:red] <error: %s> [-:-]", text))
+}
+
+func (a *App) SetFlashPending(text string) {
+	a.AppendFlash(fmt.Sprintf("[black:%s] <pending: %s> [-:-]", styles.ColorIdle, text))
+}
+
+func (a *App) SetFlashSuccess(text string) {
+	a.AppendFlash(fmt.Sprintf("[black:#50fa7b] <success: %s> [-:-]", text))
+}
+
 func (a *App) IsFlashLocked() bool {
 	a.flashMx.Lock()
 	defer a.flashMx.Unlock()

internal/ui/app_actions.go

@@ -10,7 +10,6 @@ import (
 	"github.com/jr-k/d4s/internal/ui/common"
 	"github.com/jr-k/d4s/internal/ui/components/view"
 	"github.com/jr-k/d4s/internal/ui/dialogs"
-	"github.com/jr-k/d4s/internal/ui/styles"
 )
 
 func (a *App) PerformAction(action func(id string) error, actionName string, color tcell.Color) {
@@ -37,7 +36,7 @@ func (a *App) PerformAction(action func(id string) error, actionName string, col
 	if len(ids) == 1 {
 		plural = ""
 	}
-	a.SetFlashMessage(fmt.Sprintf(" [red]%s %d item%s...", actionName, len(ids), plural), 10*time.Minute)
+	a.AppendFlashPending(fmt.Sprintf("%s %d item%s...", actionName, len(ids), plural))
 
 	a.RunInBackground(func() {
 		var errs []string
@@ -58,15 +57,15 @@ func (a *App) PerformAction(action func(id string) error, actionName string, col
 			a.StartAutoRefresh()
 
 			if len(errs) > 0 {
-				a.SetFlashMessage(fmt.Sprintf(" [red]%s completed with errors", actionName), 3*time.Second)
+				a.AppendFlashError(fmt.Sprintf("%s completed with errors", actionName))
 				dialogs.ShowResultModal(a, actionName, len(ids)-len(errs), errs)
 			} else {
 				plural := "s"
 				if len(ids) == 1 {
 					plural = ""
 				}
 				// Show success message for 3 seconds
-				a.SetFlashMessage(fmt.Sprintf(" [#50fa7b]%s %d item%s done", actionName, len(ids), plural), 1*time.Second)
+				a.AppendFlashSuccess(fmt.Sprintf("%s %d item%s done", actionName, len(ids), plural))
 
 				// Clear selection on success?
 				view.SelectedIDs = make(map[string]bool)
@@ -118,78 +117,6 @@ func (a *App) getSelectedID(v *view.ResourceView) (string, error) {
 	return v.Data[dataIndex].GetID(), nil
 }
 
-func (a *App) PerformDelete() {
-	page, _ := a.Pages.GetFrontPage()
-	view, ok := a.Views[page]
-
-	if !ok || view.RemoveFunc == nil {
-		return
-	}
-
-	action := view.RemoveFunc
-
-	ids, err := a.getTargetIDs(view)
-	if err != nil {
-		return
-	}
-
-	label := ids[0]
-	if len(ids) == 1 {
-		row, _ := view.Table.GetSelection()
-		if row > 0 && row <= len(view.Data) {
-			item := view.Data[row-1]
-			if item.GetID() == ids[0] {
-				cells := item.GetCells()
-				if len(cells) > 1 {
-					label = fmt.Sprintf("%s ([#00ffff]%s[yellow])", label, cells[1])
-				}
-			}
-		}
-	} else if len(ids) > 1 {
-		label = fmt.Sprintf("%d items", len(ids))
-	}
-
-	dialogs.ShowConfirmation(a, "DELETE", label, func(force bool) {
-		simpleAction := func(id string) error {
-			return action(id, force, a)
-		}
-		// view.HighlightIDs(ids, styles.ColorStatusRed, styles.ColorStatusRedDarkBg, time.Second)
-		// view.DeferRefresh(time.Second)
-		a.PerformAction(simpleAction, "Deleting", styles.ColorStatusRed)
-	})
-	a.UpdateShortcuts()
-}
-
-func (a *App) PerformPrune() {
-	page, _ := a.Pages.GetFrontPage()
-	view, ok := a.Views[page]
-
-	if !ok || view.PruneFunc == nil {
-		a.Flash.SetText(fmt.Sprintf("[yellow]Prune not available for %s", page))
-		return
-	}
-
-	action := view.PruneFunc
-	// Capitalize page name for display (e.g. "images" -> "Images")
-	name := strings.Title(page)
-
-	dialogs.ShowConfirmation(a, "PRUNE", name, func(force bool) {
-		a.Flash.SetText(fmt.Sprintf("[yellow]Pruning %s...", name))
-		a.RunInBackground(func() {
-			err := action(a)
-			a.TviewApp.QueueUpdateDraw(func() {
-				if err != nil {
-					a.Flash.SetText(fmt.Sprintf("[red]Prune Error: %v", err))
-				} else {
-					a.Flash.SetText(fmt.Sprintf("[green]Pruned %s", name))
-					a.RefreshCurrentView()
-				}
-			})
-		})
-	})
-	a.UpdateShortcuts()
-}
-
 func (a *App) PerformCopy() {
 	page, _ := a.Pages.GetFrontPage()
 	view, ok := a.Views[page]
@@ -253,13 +180,13 @@ func (a *App) PerformCopy() {
 
 	// 5. Copy
 	if err := a.CopyToClipboard(value); err != nil {
-		a.AppendFlash(fmt.Sprintf("[red]Copy error: %v", err))
+		a.AppendFlashError(fmt.Sprintf("%v", err))
 	} else {
 		preview := value
 		if len(preview) > 60 {
 			preview = preview[:60] + "..."
 		}
-		a.AppendFlash(fmt.Sprintf("[black:#50fa7b] <copied: %s>[-]", preview))
+		a.AppendFlashSuccess(fmt.Sprintf("copied %s", preview))
 	}
 	a.UpdateShortcuts()
 }

internal/ui/common/common.go

@@ -38,7 +38,14 @@ type AppController interface {
 	SetActiveScope(scope *Scope)
 	SetFilter(filter string)
 	SetFlashText(text string)
+	SetFlashMessage(text string, duration time.Duration)
+	SetFlashError(text string)
+	SetFlashPending(text string)
+	SetFlashSuccess(text string)
 	AppendFlash(text string)
+	AppendFlashError(text string)
+	AppendFlashPending(text string)
+	AppendFlashSuccess(text string)
 	RestoreFocus()
 
 	// Direct access for command component (needed for handlers)

internal/ui/components/command/command.go

@@ -217,17 +217,6 @@ func (c *CommandComponent) setupHandlers() {
 
 				// Apply Filter (even if empty, to clear it)
 				c.App.SetActiveFilter(filter)
-				
-				// Flash Message Context
-				// msg := ""
-				// if filter != "" {
-				// 	msg = fmt.Sprintf("Filter: %s", filter)
-				// 	front, _ := c.App.GetPages().GetFrontPage()
-				// 	if front == "inspect" {
-				// 		msg = fmt.Sprintf("Search: %s", filter)
-				// 	}
-				// }
-				// c.App.SetFlashText(msg)
 
 			} else {
 				// Command Mode

internal/ui/components/footer/footer.go

@@ -1,14 +1,14 @@
 package footer
 
 import (
-	"strings"
-
 	"github.com/jr-k/d4s/internal/ui/styles"
 	"github.com/rivo/tview"
 )
 
 type FlashComponent struct {
-	View *tview.TextView
+	View         *tview.TextView
+	mainText     string
+	appendedText string
 }
 
 func NewFlashComponent() *FlashComponent {
@@ -18,27 +18,28 @@ func NewFlashComponent() *FlashComponent {
 }
 
 func (f *FlashComponent) SetText(text string) {
-	f.View.SetText(text)
+	f.mainText = text
+	f.render()
 }
 
-// Appends text to existing content temporarily, replacing any existing "copied" message
+// Appends text to existing content temporarily.
+// It uses a dedicated slot, so multiple appends overwrite each other (last one wins),
+// but it stays separate from the main text (breadcrumb/status).
 func (f *FlashComponent) Append(text string) {
-	current := f.View.GetText(false)
-	
-	// Remove existing copy notifications to prevent stacking
-	// Looking for patterns like " <copied: ...> "
-	// A simple but effective way is to split by " <copied:" and take the first part
-	// Or use a more robust regex if needed, but string manipulation is faster here
-	// Assuming the tag starts with " [black:#50fa7b:b] <copied:" and ends with "[-] "
-	
-	// Strategy: Split by the start of our known copy tag style
-	// Tag format from app_actions: [black:#50fa7b] <copied:
-	
-	const tagStart = " [black:#50fa7b] <copied:"
-	
-	if idx := strings.Index(current, tagStart); idx != -1 {
-		current = current[:idx]
+	f.appendedText = text
+	f.render()
+}
+
+func (f *FlashComponent) ClearAppend() {
+	f.appendedText = ""
+	f.render()
+}
+
+func (f *FlashComponent) render() {
+	full := f.mainText
+	if f.appendedText != "" {
+		// Ensure separation
+		full += " " + f.appendedText
 	}
-	
-	f.View.SetText(current + " " + text)
+	f.View.SetText(full)
 }

internal/ui/components/inspect/log_inspector.go

@@ -270,7 +270,7 @@ func (i *LogInspector) startStreaming() {
 
 	if i.TextView != nil {
 		i.TextView.Clear()
-		i.TextView.SetText("[yellow]Loading logs...\n")
+		i.TextView.SetText(" [orange]Loading logs...\n")
 	}
 
 	// Channels for buffering
@@ -385,13 +385,32 @@ func (i *LogInspector) startStreaming() {
 					return
 				}
 
-				// Filter logic
+				// Filter logic (supports negation with ^)
 				if i.filter != "" {
-					if !strings.Contains(line, i.filter) {
-						continue
+					filterTerm := i.filter
+					negate := false
+					if strings.HasPrefix(filterTerm, "^") {
+						negate = true
+						filterTerm = strings.TrimPrefix(filterTerm, "^")
+					}
+
+					// If negate and term is empty (input is "^"), treat as match all (show all)
+					if negate && filterTerm == "" {
+						// no-op, show line
+					} else {
+						contains := strings.Contains(line, filterTerm)
+						if negate {
+							if contains {
+								continue
+							}
+						} else {
+							if !contains {
+								continue
+							}
+							// Highlight for positive match only
+							line = strings.ReplaceAll(line, filterTerm, fmt.Sprintf("[yellow]%s[-]", filterTerm))
+						}
 					}
-					// Highlight
-					line = strings.ReplaceAll(line, i.filter, fmt.Sprintf("[yellow]%s[-]", i.filter))
 				}
 
 				// Timestamp Coloring

internal/ui/components/inspect/text_viewer.go

@@ -167,9 +167,9 @@ func (t *TextViewer) highlightContent(content, lang string) string {
 
 func (t *TextViewer) copyToClipboard() {
 	if err := clipboard.WriteAll(t.content); err != nil {
-		t.App.SetFlashText(fmt.Sprintf("[red]Copy error: %v", err))
+		t.App.AppendFlashError(fmt.Sprintf("%v", err))
 	} else {
-		t.App.SetFlashText(fmt.Sprintf(" [black:#50fa7b] <copied: %d bytes>[-] ", len(t.content)))
+		t.App.AppendFlashSuccess(fmt.Sprintf("copied %d bytes", len(t.content)))
 	}
 }