some more refactoring

3 files changed, 23 insertions, 11 deletions

diff --git a/pkg/gui/context/commit_files_context.go b/pkg/gui/context/commit_files_context.go
index 84a5cd67c..dd557f6b2 100644
--- a/pkg/gui/context/commit_files_context.go
+++ b/pkg/gui/context/commit_files_context.go
@@ -62,7 +62,11 @@ func NewCommitFilesContext(
 	return self
 }
 
-func (self *CommitFilesContext) GetSelectedItem() (types.ListItem, bool) {
-	item := self.CommitFileTreeViewModel.GetSelectedFileNode()
-	return item, item != nil
+func (self *CommitFilesContext) GetSelectedItemId() string {
+	item := self.GetSelectedFileNode()
+	if item == nil {
+		return ""
+	}
+
+	return item.ID()
 }
diff --git a/pkg/gui/context/tags_context.go b/pkg/gui/context/tags_context.go
index c7b468972..fc6e1bde1 100644
--- a/pkg/gui/context/tags_context.go
+++ b/pkg/gui/context/tags_context.go
@@ -62,6 +62,15 @@ func NewTagsContext(
 	return self
 }
 
+func (self *TagsContext) GetSelectedItemId() string {
+	item := self.GetSelectedTag()
+	if item == nil {
+		return ""
+	}
+
+	return item.ID()
+}
+
 type TagsViewModel struct {
 	*traits.ListCursor
 	getModel func() []*models.Tag
@@ -79,11 +88,6 @@ func (self *TagsViewModel) GetSelectedTag() *models.Tag {
 	return self.getModel()[self.GetSelectedLineIdx()]
 }
 
-func (self *TagsViewModel) GetSelectedItem() (types.ListItem, bool) {
-	item := self.GetSelectedTag()
-	return item, item != nil
-}
-
 func NewTagsViewModel(getModel func() []*models.Tag) *TagsViewModel {
 	self := &TagsViewModel{
 		getModel: getModel,
diff --git a/pkg/gui/context/working_tree_context.go b/pkg/gui/context/working_tree_context.go
index 68f197259..fafddf9e8 100644
--- a/pkg/gui/context/working_tree_context.go
+++ b/pkg/gui/context/working_tree_context.go
@@ -62,7 +62,11 @@ func NewWorkingTreeContext(
 	return self
 }
 
-func (self *WorkingTreeContext) GetSelectedItem() (types.ListItem, bool) {
-	item := self.FileTreeViewModel.GetSelectedFileNode()
-	return item, item != nil
+func (self *WorkingTreeContext) GetSelectedItemId() string {
+	item := self.GetSelectedFileNode()
+	if item == nil {
+		return ""
+	}
+
+	return item.ID()
 }