chore(ui): standardize dialog identifiers

Ayman Bagabas created 2 weeks ago

Change summary

internal/ui/dialog/quit.go     | 6 +++---
internal/ui/dialog/sessions.go | 6 +++---
internal/ui/model/ui.go        | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)

Detailed changes

internal/ui/dialog/quit.go

@@ -7,8 +7,8 @@ import (
 	"github.com/charmbracelet/crush/internal/ui/common"
 )
 
-// QuitDialogID is the identifier for the quit dialog.
-const QuitDialogID = "quit"
+// QuitID is the identifier for the quit dialog.
+const QuitID = "quit"
 
 // Quit represents a confirmation dialog for quitting the application.
 type Quit struct {
@@ -56,7 +56,7 @@ func NewQuit(com *common.Common) *Quit {
 
 // ID implements [Model].
 func (*Quit) ID() string {
-	return QuitDialogID
+	return QuitID
 }
 
 // Update implements [Model].

internal/ui/dialog/sessions.go

@@ -13,8 +13,8 @@ import (
 	"github.com/charmbracelet/crush/internal/ui/list"
 )
 
-// SessionDialogID is the identifier for the session selector dialog.
-const SessionDialogID = "session"
+// SessionsID is the identifier for the session selector dialog.
+const SessionsID = "session"
 
 // Session is a session selector dialog.
 type Session struct {
@@ -96,7 +96,7 @@ func (s *Session) SelectedItem() list.Item {
 
 // ID implements Dialog.
 func (s *Session) ID() string {
-	return SessionDialogID
+	return SessionsID
 }
 
 // Update implements Dialog.

internal/ui/model/ui.go

@@ -193,7 +193,7 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		sessions.SetSize(min(120, m.width-8), 30)
 		m.dialog.AddDialog(sessions)
 	case dialog.SessionSelectedMsg:
-		m.dialog.RemoveDialog(dialog.SessionDialogID)
+		m.dialog.RemoveDialog(dialog.SessionsID)
 		cmds = append(cmds,
 			m.loadSession(msg.Session.ID),
 			m.loadSessionFiles(msg.Session.ID),
@@ -347,7 +347,7 @@ func (m *UI) handleKeyPressMsg(msg tea.KeyPressMsg) (cmds []tea.Cmd) {
 	handleQuitKeys := func(msg tea.KeyPressMsg) bool {
 		switch {
 		case key.Matches(msg, m.keyMap.Quit):
-			if !m.dialog.ContainsDialog(dialog.QuitDialogID) {
+			if !m.dialog.ContainsDialog(dialog.QuitID) {
 				m.dialog.AddDialog(dialog.NewQuit(m.com))
 				return true
 			}
@@ -370,9 +370,9 @@ func (m *UI) handleKeyPressMsg(msg tea.KeyPressMsg) (cmds []tea.Cmd) {
 		case key.Matches(msg, m.keyMap.Models):
 			// TODO: Implement me
 		case key.Matches(msg, m.keyMap.Sessions):
-			if m.dialog.ContainsDialog(dialog.SessionDialogID) {
+			if m.dialog.ContainsDialog(dialog.SessionsID) {
 				// Bring to front
-				m.dialog.BringToFront(dialog.SessionDialogID)
+				m.dialog.BringToFront(dialog.SessionsID)
 			} else {
 				cmds = append(cmds, m.loadSessionsCmd)
 			}