[fix] esc clears filter on single log page

robinovitch61 · Dec 30, 2024 · 6144e86 · 6144e86
1 parent 3320623
commit 6144e86
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/internal/app.go b/internal/app.go
@@ -422,6 +422,10 @@ func (m Model) handleKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
 		return m, tea.Batch(cmds...)
 	}
 
+	// store whether a filter is currently applied - helps make decisions later like whether to go back
+	// from single log page to logs page or just clear the filter upon user pressing ESC
+	hasAppliedFilter := m.pages[m.focusedPageType].HasAppliedFilter()
+
 	// update current page with key msg
 	m.pages[m.focusedPageType], cmd = m.pages[m.focusedPageType].Update(msg)
 	cmds = append(cmds, cmd)
@@ -498,7 +502,7 @@ func (m Model) handleKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
 
 	// single log page specific actions
 	if m.focusedPageType == page.SingleLogPageType {
-		m, cmd = m.handleSingleLogPageKeyMsg(msg)
+		m, cmd = m.handleSingleLogPageKeyMsg(msg, hasAppliedFilter)
 		cmds = append(cmds, cmd)
 		return m, tea.Batch(cmds...)
 	}
@@ -633,13 +637,13 @@ func (m Model) handleLogsPageKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
 	return m, nil
 }
 
-func (m Model) handleSingleLogPageKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
+func (m Model) handleSingleLogPageKeyMsg(msg tea.KeyMsg, hasAppliedFilter bool) (Model, tea.Cmd) {
 	// handle clear
 	var cmd tea.Cmd
 	var cmds []tea.Cmd
 	isClear := key.Matches(msg, m.keyMap.Clear)
 	notHighjackingInput := !m.pages[m.focusedPageType].HighjackingInput()
-	noAppliedFilter := !m.pages[m.focusedPageType].(page.SingleLogPage).HasAppliedFilter()
+	noAppliedFilter := !hasAppliedFilter
 	if isClear && notHighjackingInput && noAppliedFilter {
 		m, cmd = m.changeFocusedPage(page.LogsPageType)
 		cmds = append(cmds, cmd)

diff --git a/internal/page/entities.go b/internal/page/entities.go
@@ -98,6 +98,10 @@ func (p EntityPage) ContentForFile() []string {
 	return content
 }
 
+func (p EntityPage) HasAppliedFilter() bool {
+	return p.filterableViewport.Filter.Value() != ""
+}
+
 func (p EntityPage) ToggleShowContext() GenericPage {
 	p.filterableViewport.ToggleShowContext()
 	return p

diff --git a/internal/page/log.go b/internal/page/log.go
@@ -86,6 +86,10 @@ func (p SingleLogPage) ToggleShowContext() GenericPage {
 	return p
 }
 
+func (p SingleLogPage) HasAppliedFilter() bool {
+	return p.filterableViewport.Filter.Value() != ""
+}
+
 func (p SingleLogPage) ContentForClipboard() []string {
 	// don't include asci escape chars in header when copying single log to clipboard
 	header, content := veryNicelyFormatThisLog(p.log, false)
@@ -132,10 +136,6 @@ func (p SingleLogPage) WithLog(log model.PageLog) SingleLogPage {
 	return p
 }
 
-func (p SingleLogPage) HasAppliedFilter() bool {
-	return p.filterableViewport.Filter.Value() != ""
-}
-
 func veryNicelyFormatThisLog(log model.PageLog, styleHeader bool) (string, []string) {
 	header := fmt.Sprintf("%s | %s", log.Timestamps.Full, log.RenderName(log.ContainerNames.Full, styleHeader))
 	return header, formatJSON(log.Log.Content)

diff --git a/internal/page/logs.go b/internal/page/logs.go
@@ -108,6 +108,10 @@ func (p LogsPage) ContentForFile() []string {
 	return content
 }
 
+func (p LogsPage) HasAppliedFilter() bool {
+	return p.filterableViewport.Filter.Value() != ""
+}
+
 func (p LogsPage) ToggleShowContext() GenericPage {
 	p.filterableViewport.ToggleShowContext()
 	return p

diff --git a/internal/page/page.go b/internal/page/page.go
@@ -10,6 +10,7 @@ type GenericPage interface {
 	View() string
 	ContentForFile() []string
 	ToggleShowContext() GenericPage
+	HasAppliedFilter() bool
 	HighjackingInput() bool
 	WithDimensions(width, height int) GenericPage
 	WithFocus() GenericPage