Fix some table bounds issues

danielcmessias · Nov 7, 2022 · 2046d3c · 2046d3c
1 parent 9d0e757
commit 2046d3c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/ui/components/table/table.go b/ui/components/table/table.go
@@ -162,6 +162,9 @@ func (m *Model) GetCurrentItem() int {
 }
 
 func (m *Model) GetCurrentRow() Row {
+	if len(m.filteredRows) == 0 {
+		return nil
+	}
 	return m.filteredRows[m.rowsViewport.GetCurrItem()]
 }
 
@@ -170,6 +173,9 @@ func (m *Model) GetCurrentRowMarshalled() map[string]string {
 }
 
 func (m *Model) MarhsalRow(row Row) map[string]string {
+	if row == nil {
+		return nil
+	}
 	rowMap := make(map[string]string)
 	for i, col := range m.Columns {
 		rowMap[col.Title] = row[i]
@@ -293,6 +299,9 @@ func (m *Model) filterRows() {
 	}
 
 	m.rowsViewport.SetNumItems(len(m.filteredRows))
+	if m.rowsViewport.GetCurrItem() >= len(m.filteredRows) && len(m.filteredRows) > 0 {
+		m.rowsViewport.LastItem()
+	}
 	m.syncViewPortContent()
 }
 

diff --git a/ui/pages/s3/bucket.go b/ui/pages/s3/bucket.go
@@ -125,7 +125,12 @@ func (m *BucketPageModel) Inspect(client *data.Client) tea.Cmd {
 	}
 
 	context := m.Context.(BucketPageContext)
-	key := table.GetCurrentRowMarshalled()["Key"]
+	row := table.GetCurrentRowMarshalled()
+	if row == nil {
+		return nil
+	}
+	key := row["Key"]
+
 	sanitizedPrefix := context.Prefix + key
 	sanitizedPrefix = strings.Replace(sanitizedPrefix, fmt.Sprintf("%s ", icons.FILE), "", 1)
 	sanitizedPrefix = strings.Replace(sanitizedPrefix, fmt.Sprintf("%s ", icons.FOLDER), "", 1)