refactor: remove duplication on functions to open dialogs

Andrey Nering and Ayman Bagabas created 2 weeks ago

Co-authored-by: Ayman Bagabas <[e-mail]>

Change summary

internal/ui/dialog/api_key_input.go |  2 
internal/ui/model/ui.go             | 45 +++++++-----------------------
2 files changed, 12 insertions(+), 35 deletions(-)

Detailed changes

internal/ui/dialog/api_key_input.go

@@ -54,7 +54,7 @@ type APIKeyInput struct {
 var _ Dialog = (*APIKeyInput)(nil)
 
 // NewAPIKeyInput creates a new Models dialog.
-func NewAPIKeyInput(com *common.Common, provider catwalk.Provider, model config.SelectedModel, modelType config.SelectedModelType) (*APIKeyInput, error) {
+func NewAPIKeyInput(com *common.Common, provider catwalk.Provider, model config.SelectedModel, modelType config.SelectedModelType) (*APIKeyInput, tea.Cmd) {
 	t := com.Styles
 
 	m := APIKeyInput{}

internal/ui/model/ui.go

@@ -1028,49 +1028,26 @@ func substituteArgs(content string, args map[string]string) string {
 }
 
 func (m *UI) openAuthenticationDialog(provider catwalk.Provider, model config.SelectedModel, modelType config.SelectedModelType) tea.Cmd {
+	var (
+		dlg dialog.Dialog
+		cmd tea.Cmd
+	)
+
 	switch provider.ID {
 	case "hyper":
-		return m.openOAuthHyperDialog(provider, model, modelType)
+		dlg, cmd = dialog.NewOAuthHyper(m.com, provider, model, modelType)
 	case catwalk.InferenceProviderCopilot:
-		return m.openOAuthCopilotDialog(provider, model, modelType)
+		dlg, cmd = dialog.NewOAuthCopilot(m.com, provider, model, modelType)
 	default:
-		return m.openAPIKeyInputDialog(provider, model, modelType)
-	}
-}
-
-func (m *UI) openAPIKeyInputDialog(provider catwalk.Provider, model config.SelectedModel, modelType config.SelectedModelType) tea.Cmd {
-	if m.dialog.ContainsDialog(dialog.APIKeyInputID) {
-		m.dialog.BringToFront(dialog.APIKeyInputID)
-		return nil
-	}
-
-	apiKeyInputDialog, err := dialog.NewAPIKeyInput(m.com, provider, model, modelType)
-	if err != nil {
-		return uiutil.ReportError(err)
+		dlg, cmd = dialog.NewAPIKeyInput(m.com, provider, model, modelType)
 	}
-	m.dialog.OpenDialog(apiKeyInputDialog)
-	return nil
-}
-
-func (m *UI) openOAuthHyperDialog(provider catwalk.Provider, model config.SelectedModel, modelType config.SelectedModelType) tea.Cmd {
-	if m.dialog.ContainsDialog(dialog.OAuthID) {
-		m.dialog.BringToFront(dialog.OAuthID)
-		return nil
-	}
-
-	oAuthDialog, cmd := dialog.NewOAuthHyper(m.com, provider, model, modelType)
-	m.dialog.OpenDialog(oAuthDialog)
-	return cmd
-}
 
-func (m *UI) openOAuthCopilotDialog(provider catwalk.Provider, model config.SelectedModel, modelType config.SelectedModelType) tea.Cmd {
-	if m.dialog.ContainsDialog(dialog.OAuthID) {
-		m.dialog.BringToFront(dialog.OAuthID)
+	if m.dialog.ContainsDialog(dlg.ID()) {
+		m.dialog.BringToFront(dlg.ID())
 		return nil
 	}
 
-	oAuthDialog, cmd := dialog.NewOAuthCopilot(m.com, provider, model, modelType)
-	m.dialog.OpenDialog(oAuthDialog)
+	m.dialog.OpenDialog(dlg)
 	return cmd
 }