fix: <enter> on empty rows (#40)

Author: hedhyw

internal/app/app_test.go

@@ -73,7 +73,11 @@ func requireCmdMsg(tb testing.TB, expected tea.Msg, cmd tea.Cmd) {
 
 	if batch, ok := msg.(tea.BatchMsg); ok {
 		for _, cmd := range batch {
-			if cmd() == expected {
+			msg := cmd()
+
+			tb.Logf("%T: %v\n", msg, msg)
+
+			if msg == expected {
 				return
 			}
 		}

internal/app/helper.go

@@ -96,7 +96,7 @@ func (h helper) handleOpenJSONRowRequestedMsg(
 	previousState state,
 ) (tea.Model, tea.Cmd) {
 	if msg.Index < 0 || msg.Index >= len(msg.LogEntries) {
-		return nil, nil
+		return previousState, nil
 	}
 
 	logEntry := msg.LogEntries[msg.Index]

internal/app/statefiltered.go

@@ -100,6 +100,10 @@ func (s StateFiltered) handleFilterKeyClickedMsg() (tea.Model, tea.Cmd) {
 }
 
 func (s StateFiltered) handleRequestOpenJSON() (tea.Model, tea.Cmd) {
+	if len(s.logEntries) == 0 {
+		return s, events.BackKeyClicked
+	}
+
 	return s, events.OpenJSONRowRequested(s.logEntries, s.table.Cursor())
 }
 

internal/app/statefiltering_test.go

@@ -96,6 +96,8 @@ func TestStateFiltering(t *testing.T) {
 }
 
 func TestStateFilteringReset(t *testing.T) {
+	t.Parallel()
+
 	const termIncluded = "included"
 
 	const jsonFile = `
@@ -128,24 +130,42 @@ func TestStateFilteringReset(t *testing.T) {
 	_, ok = model.(app.StateFiltered)
 	assert.Truef(t, ok, "%s", model)
 
-	rendered = model.View()
+	t.Run("record_not_included", func(t *testing.T) {
+		t.Parallel()
+
+		rendered := model.View()
 
-	index := strings.Index(rendered, "filtered by:")
-	if index > 0 {
-		rendered = rendered[:index]
-	}
+		index := strings.Index(rendered, "filtered by:")
+		if assert.Greater(t, index, 0) {
+			rendered = rendered[:index]
+		}
 
-	assert.NotContains(t, rendered, termIncluded)
+		assert.NotContains(t, rendered, termIncluded)
 
-	// Come back
-	model = handleUpdate(model, tea.KeyMsg{
-		Type: tea.KeyEsc,
+		// Come back
+		model := handleUpdate(model, tea.KeyMsg{
+			Type: tea.KeyEsc,
+		})
+
+		_, ok = model.(app.StateLoaded)
+		assert.Truef(t, ok, "%s", model)
+
+		// Assert.
+		rendered = model.View()
+		assert.Contains(t, rendered, termIncluded)
 	})
 
-	_, ok = model.(app.StateLoaded)
-	assert.Truef(t, ok, "%s", model)
+	t.Run("record_not_included", func(t *testing.T) {
+		t.Parallel()
 
-	// Assert.
-	rendered = model.View()
-	assert.Contains(t, rendered, termIncluded)
+		// Try to open a record where there are no records.
+		model := handleUpdate(model, tea.KeyMsg{
+			Type: tea.KeyEnter,
+		})
+
+		assert.NotNil(t, model)
+
+		_, ok := model.(app.StateLoaded)
+		assert.Truef(t, ok, "%s", model)
+	})
 }

internal/app/stateloaded.go

@@ -108,6 +108,10 @@ func (s StateLoaded) handleArrowUpKeyClicked() tea.Cmd {
 }
 
 func (s StateLoaded) handleRequestOpenJSON() (tea.Model, tea.Cmd) {
+	if len(s.logEntries) == 0 {
+		return s, tea.Quit
+	}
+
 	return s, events.OpenJSONRowRequested(s.logEntries, s.table.Cursor())
 }
 

internal/app/stateloaded_test.go

@@ -14,6 +14,19 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestStateLoadedEmpty(t *testing.T) {
+	t.Parallel()
+
+	model := newTestModel(t, []byte(""))
+
+	_, ok := model.(app.StateLoaded)
+	require.Truef(t, ok, "%s", model)
+
+	model, cmd := model.Update(events.EnterKeyClicked())
+	require.NotNil(t, model)
+	requireCmdMsg(t, tea.Quit(), cmd)
+}
+
 func TestStateLoaded(t *testing.T) {
 	t.Parallel()
 
@@ -126,7 +139,7 @@ func TestStateLoadedReload(t *testing.T) {
 			Type: tea.KeyUp,
 		})
 
-		rendered = model.View()
+		rendered := model.View()
 		assert.Contains(t, rendered, expected)
 	})
 
@@ -147,7 +160,7 @@ func TestStateLoadedReload(t *testing.T) {
 			Type: tea.KeyUp,
 		})
 
-		rendered = model.View()
+		rendered := model.View()
 		assert.Contains(t, rendered, expected)
 	})
 }