feat(#56): show counter of filtered rows (#70)

internal/app/helper.go

@@ -102,7 +102,7 @@ func (h helper) handleLogEntriesLoadedMsg(
 
 func (h helper) handleOpenJSONRowRequestedMsg(
 	msg events.OpenJSONRowRequestedMsg,
-	previousState state,
+	previousState stateModel,
 ) (tea.Model, tea.Cmd) {
 	if msg.Index < 0 || msg.Index >= len(msg.LogEntries) {
 		return previousState, nil

internal/app/state.go

@@ -6,9 +6,9 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-type state interface {
+type stateModel interface {
 	tea.Model
 	fmt.Stringer
 
-	withApplication(application Application) (state, tea.Cmd)
+	withApplication(application Application) (stateModel, tea.Cmd)
 }

internal/app/stateerror.go

@@ -6,32 +6,32 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-// StateError is a failure message state.
-type StateError struct {
+// StateErrorModel is a failure message state.
+type StateErrorModel struct {
 	helper
 
 	err error
 }
 
-func newStateError(application Application, err error) StateError {
-	return StateError{
+func newStateError(application Application, err error) StateErrorModel {
+	return StateErrorModel{
 		helper: helper{Application: application},
 		err:    err,
 	}
 }
 
 // Init initializes component. It implements tea.Model.
-func (s StateError) Init() tea.Cmd {
+func (s StateErrorModel) Init() tea.Cmd {
 	return nil
 }
 
 // View renders component. It implements tea.Model.
-func (s StateError) View() string {
+func (s StateErrorModel) View() string {
 	return fmt.Sprintf("Something went wrong: %s.", s.err)
 }
 
 // Update handles events. It implements tea.Model.
-func (s StateError) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (s StateErrorModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	s.helper = s.helper.Update(msg)
 
 	switch msg.(type) {
@@ -43,6 +43,6 @@ func (s StateError) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 // String implements fmt.Stringer.
-func (s StateError) String() string {
+func (s StateErrorModel) String() string {
 	return modelValue(s)
 }

internal/app/stateerror_test.go

@@ -21,7 +21,7 @@ func TestStateError(t *testing.T) {
 	model := newTestModel(t, assets.ExampleJSONLog())
 	model = handleUpdate(model, events.ErrorOccuredMsg{Err: errTest})
 
-	_, ok := model.(app.StateError)
+	_, ok := model.(app.StateErrorModel)
 	assert.Truef(t, ok, "%s", model)
 
 	t.Run("rendered", func(t *testing.T) {
@@ -52,7 +52,7 @@ func TestStateError(t *testing.T) {
 
 		model := handleUpdate(model, events.ViewRowsReloadRequestedMsg{})
 
-		_, ok := model.(app.StateError)
+		_, ok := model.(app.StateErrorModel)
 		require.Truef(t, ok, "%s", model)
 	})
 }

internal/app/statefiltered.go

@@ -1,18 +1,20 @@
 package app
 
 import (
+	"fmt"
+
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 
 	"github.com/hedhyw/json-log-viewer/internal/pkg/events"
 	"github.com/hedhyw/json-log-viewer/internal/pkg/source"
 )
 
-// StateFiltered is a state that shows filtered records.
-type StateFiltered struct {
+// StateFilteredModel is a state that shows filtered records.
+type StateFilteredModel struct {
 	helper
 
-	previousState StateLoaded
+	previousState StateLoadedModel
 	table         logsTableModel
 	logEntries    source.LazyLogEntries
 
@@ -22,10 +24,10 @@ type StateFiltered struct {
 
 func newStateFiltered(
 	application Application,
-	previousState StateLoaded,
+	previousState StateLoadedModel,
 	filterText string,
-) StateFiltered {
-	return StateFiltered{
+) StateFilteredModel {
+	return StateFilteredModel{
 		helper: helper{Application: application},
 
 		previousState: previousState,
@@ -37,7 +39,7 @@ func newStateFiltered(
 }
 
 // Init initializes component. It implements tea.Model.
-func (s StateFiltered) Init() tea.Cmd {
+func (s StateFilteredModel) Init() tea.Cmd {
 	return func() tea.Msg {
 		return events.LogEntriesLoadedMsg(
 			s.previousState.logEntries.Filter(s.filterText),
@@ -46,14 +48,16 @@ func (s StateFiltered) Init() tea.Cmd {
 }
 
 // View renders component. It implements tea.Model.
-func (s StateFiltered) View() string {
-	footer := s.Application.FooterStyle.Render(" filtered by: " + s.filterText)
+func (s StateFilteredModel) View() string {
+	footer := s.Application.FooterStyle.Render(
+		fmt.Sprintf("filtered %d by: %s", len(s.logEntries), s.filterText),
+	)
 
 	return s.BaseStyle.Render(s.table.View()) + "\n" + footer
 }
 
 // Update handles events. It implements tea.Model.
-func (s StateFiltered) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (s StateFilteredModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmdBatch []tea.Cmd
 
 	s.helper = s.helper.Update(msg)
@@ -86,7 +90,7 @@ func (s StateFiltered) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return s, tea.Batch(cmdBatch...)
 }
 
-func (s StateFiltered) handleLogEntriesLoadedMsg(
+func (s StateFilteredModel) handleLogEntriesLoadedMsg(
 	msg events.LogEntriesLoadedMsg,
 ) (tea.Model, tea.Cmd) {
 	s.logEntries = source.LazyLogEntries(msg)
@@ -95,7 +99,7 @@ func (s StateFiltered) handleLogEntriesLoadedMsg(
 	return s, s.table.Init()
 }
 
-func (s StateFiltered) handleFilterKeyClickedMsg() (tea.Model, tea.Cmd) {
+func (s StateFilteredModel) handleFilterKeyClickedMsg() (tea.Model, tea.Cmd) {
 	state := newStateFiltering(
 		s.Application,
 		s.previousState,
@@ -104,15 +108,15 @@ func (s StateFiltered) handleFilterKeyClickedMsg() (tea.Model, tea.Cmd) {
 	return initializeModel(state)
 }
 
-func (s StateFiltered) handleRequestOpenJSON() (tea.Model, tea.Cmd) {
+func (s StateFilteredModel) handleRequestOpenJSON() (tea.Model, tea.Cmd) {
 	if len(s.logEntries) == 0 {
 		return s, events.BackKeyClicked
 	}
 
 	return s, events.OpenJSONRowRequested(s.logEntries, s.table.Cursor())
 }
 
-func (s StateFiltered) withApplication(application Application) (state, tea.Cmd) {
+func (s StateFilteredModel) withApplication(application Application) (stateModel, tea.Cmd) {
 	s.Application = application
 
 	var cmd tea.Cmd
@@ -122,6 +126,6 @@ func (s StateFiltered) withApplication(application Application) (state, tea.Cmd)
 }
 
 // String implements fmt.Stringer.
-func (s StateFiltered) String() string {
+func (s StateFilteredModel) String() string {
 	return modelValue(s)
 }

internal/app/statefiltered_test.go

@@ -40,7 +40,7 @@ func TestStateFiltered(t *testing.T) {
 	lines := strings.Split(model.View(), "\n")
 	assert.Contains(t, lines[len(lines)-1], ">")
 
-	_, ok := model.(app.StateFiltering)
+	_, ok := model.(app.StateFilteringModel)
 	assert.Truef(t, ok, "%s", model)
 
 	// Write term to search by.
@@ -54,10 +54,11 @@ func TestStateFiltered(t *testing.T) {
 		Type: tea.KeyEnter,
 	})
 
-	_, ok = model.(app.StateFiltered)
+	_, ok = model.(app.StateFilteredModel)
 	if assert.Truef(t, ok, "%s", model) {
 		rendered = model.View()
 		assert.Contains(t, rendered, termIncluded)
+		assert.Contains(t, rendered, "filtered 1 by: "+termIncluded)
 		assert.NotContains(t, rendered, termExcluded)
 	}
 
@@ -69,7 +70,7 @@ func TestStateFiltered(t *testing.T) {
 			Runes: []rune{'f'},
 		})
 
-		_, ok := model.(app.StateFiltering)
+		_, ok := model.(app.StateFilteringModel)
 		assert.Truef(t, ok, "%s", model)
 	})
 
@@ -80,14 +81,14 @@ func TestStateFiltered(t *testing.T) {
 			Type: tea.KeyEnter,
 		})
 
-		_, ok := model.(app.StateViewRow)
+		_, ok := model.(app.StateViewRowModel)
 		assert.Truef(t, ok, "%s", model)
 
 		model = handleUpdate(model, tea.KeyMsg{
 			Type: tea.KeyEsc,
 		})
 
-		_, ok = model.(app.StateFiltered)
+		_, ok = model.(app.StateFilteredModel)
 		assert.Truef(t, ok, "%s", model)
 	})
 
@@ -96,7 +97,7 @@ func TestStateFiltered(t *testing.T) {
 
 		model := handleUpdate(model, events.ErrorOccuredMsg{Err: getTestError()})
 
-		_, ok := model.(app.StateError)
+		_, ok := model.(app.StateErrorModel)
 		assert.Truef(t, ok, "%s", model)
 	})
 
@@ -107,7 +108,7 @@ func TestStateFiltered(t *testing.T) {
 			Type: tea.KeyUp,
 		})
 
-		_, ok = model.(app.StateFiltered)
+		_, ok = model.(app.StateFilteredModel)
 		assert.Truef(t, ok, "%s", model)
 	})
 
@@ -118,7 +119,7 @@ func TestStateFiltered(t *testing.T) {
 			Type: tea.KeyEsc,
 		})
 
-		_, ok := model.(app.StateLoaded)
+		_, ok := model.(app.StateLoadedModel)
 		assert.Truef(t, ok, "%s", model)
 	})
 

internal/app/statefiltering.go

@@ -8,11 +8,11 @@ import (
 	"github.com/hedhyw/json-log-viewer/internal/pkg/events"
 )
 
-// StateFiltering is a state to prompt for filter term.
-type StateFiltering struct {
+// StateFilteringModel is a state to prompt for filter term.
+type StateFilteringModel struct {
 	helper
 
-	previousState StateLoaded
+	previousState StateLoadedModel
 	table         logsTableModel
 
 	textInput textinput.Model
@@ -21,12 +21,12 @@ type StateFiltering struct {
 
 func newStateFiltering(
 	application Application,
-	previousState StateLoaded,
-) StateFiltering {
+	previousState StateLoadedModel,
+) StateFilteringModel {
 	textInput := textinput.New()
 	textInput.Focus()
 
-	return StateFiltering{
+	return StateFilteringModel{
 		helper: helper{Application: application},
 
 		previousState: previousState,
@@ -38,17 +38,17 @@ func newStateFiltering(
 }
 
 // Init initializes component. It implements tea.Model.
-func (s StateFiltering) Init() tea.Cmd {
+func (s StateFilteringModel) Init() tea.Cmd {
 	return nil
 }
 
 // View renders component. It implements tea.Model.
-func (s StateFiltering) View() string {
+func (s StateFilteringModel) View() string {
 	return s.BaseStyle.Render(s.table.View()) + "\n" + s.textInput.View()
 }
 
 // Update handles events. It implements tea.Model.
-func (s StateFiltering) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (s StateFilteringModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmdBatch []tea.Cmd
 
 	s.helper = s.helper.Update(msg)
@@ -76,15 +76,15 @@ func (s StateFiltering) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return s, tea.Batch(cmdBatch...)
 }
 
-func (s StateFiltering) handleKeyMsg(msg tea.KeyMsg) tea.Cmd {
+func (s StateFilteringModel) handleKeyMsg(msg tea.KeyMsg) tea.Cmd {
 	if len(msg.Runes) == 1 {
 		return nil
 	}
 
 	return s.helper.handleKeyMsg(msg)
 }
 
-func (s StateFiltering) handleEnterKeyClickedMsg() (tea.Model, tea.Cmd) {
+func (s StateFilteringModel) handleEnterKeyClickedMsg() (tea.Model, tea.Cmd) {
 	if s.textInput.Value() == "" {
 		return s, events.BackKeyClicked
 	}
@@ -97,6 +97,6 @@ func (s StateFiltering) handleEnterKeyClickedMsg() (tea.Model, tea.Cmd) {
 }
 
 // String implements fmt.Stringer.
-func (s StateFiltering) String() string {
+func (s StateFilteringModel) String() string {
 	return modelValue(s)
 }