added poups for errors enabled dynamic table scaling

Author: Jannes-Dailidow

ui/tui/models/views/popup/message_model.go

@@ -22,21 +22,18 @@ const (
 type MessageSeverity int
 
 type MessageModel struct {
-	form      form.Form[struct{}]
-	innerSize util.Size
-	size      util.Size
+	form form.Form[struct{}]
+	size util.Size
 }
 
-func OpenMessage(severity MessageSeverity, message string, cmd tea.Cmd, width, height int) tea.Cmd {
-	return popup.Open(util.ModelPointer(newMessage(severity, message, cmd, width, height)))
+func OpenMessage(severity MessageSeverity, message string, cmd tea.Cmd) tea.Cmd {
+	return popup.Open(util.ModelPointer(newMessage(severity, message, cmd)))
 }
 
 func newMessage(
 	severity MessageSeverity,
 	message string,
 	cmd tea.Cmd,
-	width int,
-	height int,
 ) *MessageModel {
 	switch severity {
 	case MessageInfo:
@@ -56,10 +53,6 @@ func newMessage(
 				return tea.Sequence(popup.Close(), cmd)
 			}),
 		),
-		innerSize: util.Size{
-			Width:  width,
-			Height: height,
-		},
 	}
 }
 
@@ -70,26 +63,24 @@ func (m MessageModel) Init() tea.Cmd {
 func (m *MessageModel) Update(msg tea.Msg) tea.Cmd {
 	if m.size.UpdateFromMsg(msg) {
 		size := util.Size{
-			Width:  min(m.innerSize.Width, m.size.Width),
-			Height: min(m.innerSize.Height, m.size.Height),
+			Width:  util.Clamp(6, m.size.Width/2, m.size.Width),
+			Height: util.Clamp(7, m.size.Height/2, m.size.Height),
 		}
 		return m.form.Update(size.ToMsg())
 	}
 	return m.form.Update(msg)
 }
 
 func (m MessageModel) View() string {
-	// TODO only for testing... size of form needs to be made non greedy
-	return lipgloss.NewStyle().MaxWidth(40).Render(m.form.View())
-	// return m.form.View()
+	return lipgloss.NewStyle().
+		MaxWidth(m.size.Width).
+		MaxHeight(m.size.Height).
+		Render(m.form.View())
 }
 
-func (m *MessageModel) Focus(parentKeyMap help.KeyMap) tea.Cmd {
-	return m.form.Focus(parentKeyMap)
-}
-func (m *MessageModel) Blur() {
-	m.form.Blur()
-}
+func (m *MessageModel) Focus(parentKeyMap help.KeyMap) tea.Cmd { return m.form.Focus(parentKeyMap) }
+
+func (m *MessageModel) Blur() { m.form.Blur() }
 
 // *[MessageModel] implements [util.Model]
 var _ util.Model = (*MessageModel)(nil)

ui/tui/models/views/publickey/create_model.go

@@ -71,20 +71,22 @@ func (m *CreateModel) Init() tea.Cmd {
 				form.WithOnCancel[createFormImport](func() tea.Cmd { return popup.Close() }),
 				form.WithOnSubmit(func(result createFormImport, err error) tea.Cmd {
 					if err != nil {
-						return popupviews.OpenMessage(popupviews.MessageError, err.Error(), nil, 50, 20)
-					}
-
-					// TODO parse result.key
-					parts := strings.Split(result.Key, " ")
-
-					if len(parts) < 2 || len(parts) > 3 {
-						return popupviews.OpenMessage(popupviews.MessageError, "unable to parse public key", nil, 50, 20)
+						return popupviews.OpenMessage(popupviews.MessageError, err.Error(), nil)
 					}
 
 					var data, algorithm, comment string
-					data, algorithm = parts[0], parts[1]
-					if len(parts) == 3 {
-						comment = parts[2]
+					// TODO parse result.key... using this mock for now:
+					{
+						parts := strings.Split(result.Key, " ")
+
+						if len(parts) < 2 || len(parts) > 3 {
+							return popupviews.OpenMessage(popupviews.MessageError, "unable to parse public key", nil)
+						}
+
+						data, algorithm = parts[0], parts[1]
+						if len(parts) == 3 {
+							comment = parts[2]
+						}
 					}
 
 					return tea.Sequence(popup.Close(), func() tea.Msg { return createMsgImportResult{data, algorithm, comment} })
@@ -130,13 +132,7 @@ func (m *CreateModel) Init() tea.Cmd {
 		form.WithInitialData(util.DerefOrNullValue(m.preset)),
 	))
 
-	initCmd := m.form.Init()
-
-	// if m.preset != nil {
-	// 	_ = m.form.Set(*m.preset)
-	// }
-
-	return initCmd
+	return m.form.Init()
 }
 
 // Update implements util.Model.
@@ -163,8 +159,7 @@ func (m *CreateModel) Update(msg tea.Msg) tea.Cmd {
 	case createMsgCreateResult:
 		m.locked = nil
 		if msg.err != nil {
-			// TODO open popup displaying error
-			return nil
+			return popupviews.OpenMessage(popupviews.MessageError, "Error creating Public Key:\n"+msg.err.Error(), nil)
 		}
 		return tea.Sequence(m.rc.Pop(1), func() tea.Msg { return CreateMsgCreated{msg.publicKeyId} })
 
@@ -175,7 +170,7 @@ func (m *CreateModel) Update(msg tea.Msg) tea.Cmd {
 		return nil
 	}
 
-	// pass key msg to form
+	// pass remaining msgs to form
 	return m.form.Update(msg)
 }
 

ui/tui/models/views/publickey/edit_model.go

@@ -12,6 +12,7 @@ import (
 	"github.com/toeirei/keymaster/ui/tui/models/components/router"
 	"github.com/toeirei/keymaster/ui/tui/models/helpers/form"
 	formelement "github.com/toeirei/keymaster/ui/tui/models/helpers/form/element"
+	popupviews "github.com/toeirei/keymaster/ui/tui/models/views/popup"
 	"github.com/toeirei/keymaster/ui/tui/util"
 	"github.com/toeirei/keymaster/ui/tui/util/keys"
 )
@@ -105,17 +106,15 @@ func (m *EditModel) Update(msg tea.Msg) tea.Cmd {
 		m.publicKey = msg.publicKey
 		_ = m.refreshForm()
 		if msg.err != nil {
-			// TODO open popup displaying error
-			return nil
+			return popupviews.OpenMessage(popupviews.MessageError, "Error loading Public Key:\n"+msg.err.Error(), nil)
 		}
 		return nil
 
 	case editMsgUpdateResult:
 		m.locked = nil
 		if msg.err != nil {
 			if msg.err != nil {
-				// TODO open popup displaying error
-				return nil
+				return popupviews.OpenMessage(popupviews.MessageError, "Error updating Public Key:\n"+msg.err.Error(), nil)
 			}
 			return nil
 		}

ui/tui/models/views/publickey/list_model.go

@@ -18,6 +18,7 @@ import (
 	popupviews "github.com/toeirei/keymaster/ui/tui/models/views/popup"
 	"github.com/toeirei/keymaster/ui/tui/util"
 	"github.com/toeirei/keymaster/ui/tui/util/keys"
+	"github.com/toeirei/keymaster/util/slicest"
 )
 
 type ListModel struct {
@@ -78,12 +79,10 @@ func (m *ListModel) Update(msg tea.Msg) tea.Cmd {
 	case listMsgDeleteResult:
 		m.locked = nil
 		if msg.err != nil {
-			// TODO show popup with error
-			return nil
+			return popupviews.OpenMessage(popupviews.MessageError, "Error deleting Public Key:\n"+msg.err.Error(), nil)
 		}
 		m.publicKeys = slices.DeleteFunc(m.publicKeys, func(pk client.PublicKey) bool { return pk.Id == msg.publicKey.Id })
 		m.refreshTable()
-		// TODO does not work for some reason
 		return nil
 
 	case EditMsgUpdated, CreateMsgCreated:
@@ -100,7 +99,7 @@ func (m *ListModel) Update(msg tea.Msg) tea.Cmd {
 
 		case key.Matches(msg, ListBaseKeyMap.Edit):
 			if m.table.Cursor() == -1 {
-				return nil // TODO open popup with "please select a public key" text
+				return popupviews.OpenMessage(popupviews.MessageInfo, "Please select a Public Key to edit.", nil)
 			}
 			return m.rc.Push(util.ModelPointer(NewEdit(
 				m.client,
@@ -110,7 +109,7 @@ func (m *ListModel) Update(msg tea.Msg) tea.Cmd {
 
 		case key.Matches(msg, ListBaseKeyMap.Duplicate):
 			if m.table.Cursor() == -1 {
-				return nil // TODO open popup with "please select a public key" text
+				return popupviews.OpenMessage(popupviews.MessageInfo, "Please select a Public Key to duplicate.", nil)
 			}
 			publicKey := m.publicKeys[m.table.Cursor()]
 			return m.rc.Push(util.ModelPointer(NewCreate(m.client, m.rc, &createFormData{publicKey.Data, publicKey.Algorithm, publicKey.Comment, tagsStringify(publicKey.Tags)})))
@@ -197,11 +196,19 @@ func (m *ListModel) reload() tea.Cmd {
 }
 
 func (m *ListModel) refreshTable() {
-	// TODO this code is just a prove of concept and needs improvements like dynamic scaling!
+	algorithmWidth := slicest.Reduce(m.publicKeys, func(k client.PublicKey, w int) int { return max(w, len(k.Algorithm)) })
+	commentWidth := slicest.Reduce(m.publicKeys, func(k client.PublicKey, w int) int { return max(w, len(k.Comment)) })
+	tagsWidth := slicest.Reduce(m.publicKeys, func(k client.PublicKey, w int) int { return max(w, len(strings.Join(k.Tags, ", "))) })
+
+	// tags take 50% screen max
+	tagsWidth = min((m.size.Width-6)/2, tagsWidth)
+
+	remainingWidth := m.size.Width - 6 - algorithmWidth - commentWidth - tagsWidth
+
 	m.table.SetColumns([]table.Column{
-		{Title: "Algorithm", Width: 10},
-		{Title: "Comment", Width: 10},
-		{Title: "Tags", Width: m.size.Width - 20 - 6},
+		{Title: "Algorithm", Width: algorithmWidth + remainingWidth/3},
+		{Title: "Comment", Width: commentWidth + remainingWidth/3},
+		{Title: "Tags", Width: tagsWidth + remainingWidth/3},
 	})
 
 	m.table.SetRows(slices.Map(m.publicKeys, func(publicKey client.PublicKey) table.Row {