feat: update container info handling to support Docker Compose labels, improve info panel rendering and navigation

shubh-io · shubh-io · commit e11079e39cc2 · 2025-12-27T18:22:52.000+05:30
diff --git a/internal/docker/client.go b/internal/docker/client.go
@@ -484,10 +484,10 @@ func FetchComposeProjects() (map[string]*ComposeProject, error) {
 				}
 			}
 
-			serviceName := e.Labels["io.podman.compose.service"]
-			containerNumber := e.Labels["io.podman.compose.container-number"]
-			configFile := e.Labels["io.podman.compose.project.config_files"]
-			workingDir := e.Labels["io.podman.compose.project.working_dir"]
+			serviceName := e.Labels["com.docker.compose.service"]
+			// containerNumber := e.Labels["io.podman.compose.container-number"]
+			configFile := e.Labels["com.docker.compose.project.config_files"]
+			workingDir := e.Labels["com.docker.compose.project.working_dir"]
 
 			if projectName == "" {
 				continue
@@ -515,7 +515,9 @@ func FetchComposeProjects() (map[string]*ComposeProject, error) {
 				Ports:          ports,
 				ComposeProject: projectName,
 				ComposeService: serviceName,
-				ComposeNumber:  containerNumber,
+				// ComposeNumber:  containerNumber,
+				ComposeDirectory:     workingDir,
+				ComposeFileDirectory: (workingDir + "/" + configFile),
 			}
 
 			if state == "running" {
@@ -592,15 +594,17 @@ func FetchComposeProjects() (map[string]*ComposeProject, error) {
 			}
 
 			container := Container{
-				ID:             e.ID,
-				Names:          names,
-				Image:          e.Image,
-				Status:         e.Status,
-				State:          state,
-				Ports:          e.Ports,
-				ComposeProject: projectName,
-				ComposeService: serviceName,
-				ComposeNumber:  containerNumber,
+				ID:                   e.ID,
+				Names:                names,
+				Image:                e.Image,
+				Status:               e.Status,
+				State:                state,
+				Ports:                e.Ports,
+				ComposeProject:       projectName,
+				ComposeService:       serviceName,
+				ComposeNumber:        containerNumber,
+				ComposeDirectory:     labels["com.docker.compose.project.working_dir"],
+				ComposeFileDirectory: labels["com.docker.compose.project.config_files"],
 			}
 
 			if state == "running" {
diff --git a/internal/tui/info-panel.go b/internal/tui/info-panel.go
@@ -3,6 +3,8 @@ package tui
 import (
 	"fmt"
 	"strings"
+
+	"github.com/shubh-io/dockmate/internal/docker"
 )
 
 func (m model) renderInfoPanel(width int) string {
@@ -11,18 +13,49 @@ func (m model) renderInfoPanel(width int) string {
 	b.WriteString(dividerStyle.Render(strings.Repeat("─", width)))
 	b.WriteString("\n")
 
+	id := m.infoContainerID
+	if id == "" && m.infoContainer != nil {
+		id = m.infoContainer.ID
+	}
+
+	var container *docker.Container
+
+	if id != "" {
+
+		for _, p := range m.projects {
+			for i := range p.Containers {
+				if p.Containers[i].ID == id {
+					container = &p.Containers[i]
+					break
+				}
+			}
+			if container != nil {
+				break
+			}
+		}
+		if container == nil {
+			for i := range m.containers {
+				if m.containers[i].ID == id {
+					container = &m.containers[i]
+					break
+				}
+			}
+		}
+	}
+
 	containerName := ""
-	if m.infoContainer != nil && len(m.infoContainer.Names) > 0 {
-		containerName = m.infoContainer.Names[0]
+	if container != nil && len(container.Names) > 0 {
+		containerName = container.Names[0]
 	}
+
 	infoTitle := fmt.Sprintf("Container Info: %s ", containerName)
 	if visibleLen(infoTitle) < width {
 		infoTitle += strings.Repeat(" ", width-visibleLen(infoTitle))
 	}
 	b.WriteString(titleStyle.Render(infoTitle))
 	b.WriteString("\n")
 
-	if m.infoContainer == nil {
+	if container == nil {
 		noContainerMsg := "  No container selected"
 		if visibleLen(noContainerMsg) < width {
 			noContainerMsg += strings.Repeat(" ", width-visibleLen(noContainerMsg))
@@ -32,56 +65,61 @@ func (m model) renderInfoPanel(width int) string {
 		return b.String()
 	}
 
-	c := m.infoContainer
-
 	// Display container information fields
 	infoFields := []struct {
 		label string
 		value string
 	}{
-		{"Container ID", c.ID},
+		{"Container ID", container.ID},
 		{"Name", containerName},
-		{"Image", c.Image},
-		{"Status", c.Status},
-		{"State", c.State},
-		{"CPU Usage", c.CPU},
-		{"Memory Usage", c.Memory},
-		{"Network I/O", c.NetIO},
-		{"Block I/O", c.BlockIO},
-		{"Ports", c.Ports},
+		{"Image", container.Image},
+		{"Status", container.Status},
+		{"State", container.State},
+		{"CPU Usage", container.CPU},
+		{"Memory Usage", container.Memory},
+		{"Network I/O", container.NetIO},
+		{"Block I/O", container.BlockIO},
+		{"Ports", container.Ports},
+		// {"Compose Project", container.ComposeProject},
+		// {"Compose File Directory", container.ComposeFileDirectory},
+		// {"Compose Directory", container.ComposeDirectory},
+		// {"Compose Service", container.ComposeService},
 	}
 
 	// Add compose-specific fields if available
-	if c.ComposeProject != "" {
+	if container.ComposeProject != "" {
 		infoFields = append(infoFields, struct {
 			label string
 			value string
-		}{"Compose Project", c.ComposeProject})
+		}{"Compose Project", container.ComposeProject})
 	}
-	if c.ComposeDirectory != "" {
+	if container.ComposeDirectory != "" {
 		infoFields = append(infoFields, struct {
 			label string
 			value string
-		}{"Compose Directory", c.ComposeDirectory})
+		}{"Compose Directory", container.ComposeDirectory})
 	}
-	if c.ComposeFileDirectory != "" {
+	if container.ComposeFileDirectory != "" {
 		infoFields = append(infoFields, struct {
 			label string
 			value string
-		}{"Compose File Directory", c.ComposeFileDirectory})
+		}{"Compose File Directory", container.ComposeFileDirectory})
 	}
-	if c.ComposeService != "" {
+	if container.ComposeService != "" {
 		infoFields = append(infoFields, struct {
 			label string
 			value string
-		}{"Compose Service", c.ComposeService})
+		}{"Compose Service", container.ComposeService})
+	}
+	panelHeight := m.infoPanelHeight
+	if container != nil && container.ComposeFileDirectory == "" {
+		panelHeight -= 4
 	}
 
-	maxInfoLines := m.infoPanelHeight - 2 // account for divider and title
+	maxInfoLines := panelHeight - 2 // account for divider and title
 	if maxInfoLines < 1 {
 		maxInfoLines = 1
 	}
-
 	// Render info fields with wrapping
 	renderedLines := 0
 	for _, field := range infoFields {
diff --git a/internal/tui/model.go b/internal/tui/model.go
@@ -75,6 +75,7 @@ func InitialModel() model {
 		infoVisible:          false,
 		infoPanelHeight:      INFO_PANEL_HEIGHT,
 		infoContainer:        nil,
+		infoContainerID:      "",
 		sortBy:               sortByStatus,
 		sortAsc:              false, // descending
 		columnMode:           false,
@@ -178,7 +179,12 @@ func (m *model) calculateMaxContainers() int {
 		availableHeight -= m.logPanelHeight
 	}
 	if m.infoVisible {
-		availableHeight -= INFO_PANEL_HEIGHT
+		// if compose file dir visible:
+		if m.infoContainer != nil && m.infoContainer.ComposeFileDirectory != "" {
+			availableHeight -= INFO_PANEL_HEIGHT
+		} else {
+			availableHeight -= (INFO_PANEL_HEIGHT - 4)
+		}
 	}
 	maxContainers := availableHeight / CONTAINER_ROW_HEIGHT
 	if maxContainers < 1 {
@@ -194,17 +200,25 @@ func (m *model) updatePagination() {
 		m.maxContainersPerPage = 1
 	}
 
-	if len(m.containers) == 0 {
+	itemCount := len(m.containers)
+	if m.composeViewMode {
+		itemCount = len(m.flatList)
+	}
+
+	if itemCount == 0 {
 		m.cursor = 0
 		m.page = 0
 		return
 	}
 
-	if m.cursor >= len(m.containers) {
-		m.cursor = len(m.containers) - 1
+	if m.cursor >= itemCount {
+		m.cursor = itemCount - 1
+	}
+	if m.cursor < 0 {
+		m.cursor = 0
 	}
 
-	maxPage := (len(m.containers) - 1) / m.maxContainersPerPage
+	maxPage := (itemCount - 1) / m.maxContainersPerPage
 	if maxPage < 0 {
 		maxPage = 0
 	}
@@ -221,7 +235,7 @@ func (m *model) updatePagination() {
 
 	// keep persistent page indicator up-to-date
 	if m.maxContainersPerPage > 0 {
-		maxPage = (len(m.containers) - 1) / m.maxContainersPerPage
+		maxPage = (itemCount - 1) / m.maxContainersPerPage
 		if maxPage < 0 {
 			maxPage = 0
 		}
@@ -268,7 +282,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if m.cursor >= len(m.containers) {
 			m.cursor = max(0, len(m.containers)-1)
 		}
-
 		m.refreshInfoContainer()
 
 		m.updatePagination()
@@ -782,7 +795,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			case key.Matches(msg, Keys.Down):
 				if !m.columnMode {
 					if m.composeViewMode {
-						if len(m.flatList) > 0 {
+						if m.cursor < len(m.flatList)-1 {
 							m.moveCursorDownTree()
 						}
 					} else {
@@ -970,10 +983,12 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					m.infoVisible = !m.infoVisible
 					if m.infoVisible {
 						m.infoContainer = selected
+						m.infoContainerID = selected.ID
 						m.currentMode = modeInfo
-						m.statusMessage = "Showing container info"
+						// m.statusMessage = "Showing container info"
 					} else {
 						m.infoContainer = nil
+						m.infoContainerID = ""
 						m.currentMode = modeNormal
 						m.statusMessage = "Info panel closed"
 					}
diff --git a/internal/tui/types.go b/internal/tui/types.go
@@ -29,6 +29,7 @@ type model struct {
 	infoVisible          bool                              // info panel visible?
 	infoPanelHeight      int                               // height of info panel
 	infoContainer        *docker.Container                 // container for info display
+	infoContainerID      string                            // info container ID
 	sortBy               sortColumn                        // which column to sort by
 	sortAsc              bool                              // sort direction
 	columnMode           bool                              // column nav mode (vs row nav)
