[feat] add key to clear all selected containers

Author: robinovitch61

README.md

@@ -61,6 +61,8 @@ Press `?` in any view to see keyboard shortcuts specific to the current view and
 
 | Key            | Action                                          |
 |----------------|-------------------------------------------------|
+| enter          | in container selection view, toggle logs        |
+| R              | deselect all containers and clear logs          |
 | ↓/j            | down one line                                   |
 | ↑/k            | up one line                                     |
 | d              | down half page                                  |

internal/app.go

@@ -537,7 +537,43 @@ func (m Model) handleEntitiesPageKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
 	if key.Matches(msg, m.keyMap.Enter) {
 		selected, selectionActions := m.pages[m.focusedPageType].(page.EntityPage).GetSelectionActions()
 		if len(selectionActions) > constants.ConfirmSelectionActionsThreshold {
-			return m.promptToConfirmSelectionActions(selected, selectionActions)
+			// display a prompt to confirm selection actions
+			// use the terminology select & deselect instead of activate, get log scanner, etc.
+			var numToActivate, numToDeactivate int
+			for _, getLogScanner := range selectionActions {
+				if getLogScanner {
+					numToActivate++
+				} else {
+					numToDeactivate++
+				}
+			}
+			topLine := fmt.Sprintf("Select %d visible containers", numToActivate)
+			if numToActivate > 0 && numToDeactivate > 0 {
+				topLine = fmt.Sprintf("Select %d & deselect %d visible containers", numToActivate, numToDeactivate)
+			} else if numToDeactivate > 0 {
+				topLine = fmt.Sprintf("Deselect %d visible containers", numToDeactivate)
+			}
+			topLine = fmt.Sprintf("%s for %s", topLine, selected.Type())
+			bottomLine := fmt.Sprintf("%s?", selected.Container.HumanReadable())
+			text := []string{topLine, bottomLine}
+			return m.promptToConfirmSelectionActions(text, selectionActions)
+		} else {
+			return m.doSelectionActions(selectionActions)
+		}
+	}
+
+	// handle deselecting all containers
+	if key.Matches(msg, m.keyMap.DeselectAll) {
+		selectionActions := make(map[model.Entity]bool)
+		containerEntities := m.entityTree.GetContainerEntities()
+		for i := range containerEntities {
+			if !containerEntities[i].State.ActivatesWhenSelected() {
+				selectionActions[containerEntities[i]] = false
+			}
+		}
+		if len(selectionActions) > constants.ConfirmSelectionActionsThreshold {
+			text := []string{fmt.Sprintf("Deselect all %d containers?", len(selectionActions))}
+			return m.promptToConfirmSelectionActions(text, selectionActions)
 		} else {
 			return m.doSelectionActions(selectionActions)
 		}
@@ -555,26 +591,7 @@ func (m Model) handleEntitiesPageKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
 	return m, nil
 }
 
-func (m Model) promptToConfirmSelectionActions(selected model.Entity, selectionActions map[model.Entity]bool) (Model, tea.Cmd) {
-	// display a prompt to confirm selection actions
-	// use the terminology select & deselect instead of activate, get log scanner, etc.
-	var numToActivate, numToDeactivate int
-	for _, getLogScanner := range selectionActions {
-		if getLogScanner {
-			numToActivate++
-		} else {
-			numToDeactivate++
-		}
-	}
-	topLine := fmt.Sprintf("Select %d visible containers", numToActivate)
-	if numToActivate > 0 && numToDeactivate > 0 {
-		topLine = fmt.Sprintf("Select %d & deselect %d visible containers", numToActivate, numToDeactivate)
-	} else if numToDeactivate > 0 {
-		topLine = fmt.Sprintf("Deselect %d visible containers", numToDeactivate)
-	}
-	topLine = fmt.Sprintf("%s for %s", topLine, selected.Type())
-	bottomLine := fmt.Sprintf("%s?", selected.Container.HumanReadable())
-	text := []string{topLine, bottomLine}
+func (m Model) promptToConfirmSelectionActions(text []string, selectionActions map[model.Entity]bool) (Model, tea.Cmd) {
 	m.prompt = prompt.New(true, m.width, m.height-m.topBarHeight, text, m.styles.Inverse)
 	m.whenPromptConfirm = func() (Model, tea.Cmd) { return m.doSelectionActions(selectionActions) }
 	return m, nil

internal/help/help.go

@@ -8,12 +8,12 @@ import (
 
 func MakeHelp(keyMap keymap.KeyMap, keyColStyle lipgloss.Style) string {
 	title := lipgloss.NewStyle().Border(lipgloss.NormalBorder()).Padding(0, 1).Render("Help (press any key to hide)")
-	rowsPerCol := 10
+	rowsPerCol := 11
 
 	generalHelp := lipgloss.JoinVertical(
 		lipgloss.Center,
 		"",
-		formatKeyBindings(keymap.GlobalKeyBindings(keyMap), rowsPerCol, keyColStyle),
+		formatKeyBindings(keymap.DescriptiveKeyBindings(keyMap), rowsPerCol, keyColStyle),
 		"",
 		formatKeyBindings(keymap.LookbackKeyBindings(keyMap), 6, keyColStyle),
 	)

internal/keymap/keymap.go

@@ -9,6 +9,7 @@ type KeyMap struct {
 	Copy                key.Binding
 	Context             key.Binding
 	Enter               key.Binding
+	DeselectAll         key.Binding
 	Filter              key.Binding
 	FilterRegex         key.Binding
 	FilterNextRow       key.Binding
@@ -61,6 +62,10 @@ func DefaultKeyMap() KeyMap {
 			key.WithKeys("enter"),
 			key.WithHelp("enter", ""), // means different things on different pages
 		),
+		DeselectAll: key.NewBinding(
+			key.WithKeys("shift+r"),
+			key.WithHelp("R", "deselect all containers"),
+		),
 		Filter: key.NewBinding(
 			key.WithKeys("/"),
 			key.WithHelp("/", "edit filter"),
@@ -200,9 +205,10 @@ func LookbackKeyBindings(km KeyMap) []key.Binding {
 	}
 }
 
-func GlobalKeyBindings(km KeyMap) []key.Binding {
-	// available from anywhere on the app
+func DescriptiveKeyBindings(km KeyMap) []key.Binding {
 	return []key.Binding{
+		WithDesc(km.Enter, "select/deselect containers"),
+		km.DeselectAll,
 		km.Logs,
 		km.LogsFullScreen,
 		km.Selection,

internal/model/entity.go

@@ -120,7 +120,7 @@ func (e Entity) Type() string {
 	} else if e.IsNamespace {
 		return "namespace"
 	} else if e.IsPodOwner {
-		return "podOwner"
+		return "pod owner"
 	} else if e.IsPod {
 		return "pod"
 	} else {