disable enter fucntionailt for table header

one2nc · Feb 10, 2023 · 16709af · 16709af
1 parent bb971c1
commit 16709af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/internal/view/ec2.go b/internal/view/ec2.go
@@ -33,10 +33,14 @@ func (e *EC2) bindKeys(aa ui.KeyActions) {
 
 func (e *EC2) enterCmd(evt *tcell.EventKey) *tcell.EventKey {
 	instanceId := e.GetTable().GetSelectedItem()
-	f := describeResource
-	if e.GetTable().enterFn != nil {
-		f = e.GetTable().enterFn
+	if instanceId != "" {
+		f := describeResource
+		if e.GetTable().enterFn != nil {
+			f = e.GetTable().enterFn
+		}
+		f(e.App(), e.GetTable().GetModel(), e.Resource(), instanceId)
+		e.App().Flash().Info("Instance Id: " + instanceId)
 	}
-	f(e.App(), e.GetTable().GetModel(), e.Resource(), instanceId)
+
 	return nil
 }
diff --git a/internal/view/sec_grp.go b/internal/view/sec_grp.go
@@ -28,12 +28,15 @@ func (sg SG) bindKeys(aa ui.KeyActions) {
 
 func (sg *SG) enterCmd(evt *tcell.EventKey) *tcell.EventKey {
 	groupId := sg.GetTable().GetSelectedItem()
-	sg.App().Flash().Info("groupId: " + groupId)
+	if groupId != "" {
+		f := describeResource
+		if sg.GetTable().enterFn != nil {
+			f = sg.GetTable().enterFn
+		}
+		f(sg.App(), sg.GetTable().GetModel(), sg.Resource(), groupId)
+		sg.App().Flash().Info("groupId: " + groupId)
 
-	f := describeResource
-	if sg.GetTable().enterFn != nil {
-		f = sg.GetTable().enterFn
 	}
-	f(sg.App(), sg.GetTable().GetModel(), sg.Resource(), groupId)
+
 	return nil
 }