added new header for while fetching

Author: MaxThom

internal/ui/tui/pages/device/cfg/response/resp.go

@@ -29,12 +29,13 @@ var (
 )
 
 type Model struct {
-	ctx     context.Context
-	help    mir_help.Model
-	cfgReq  *mir_apiv1.SendConfigRequest
-	cfgResp map[string]*mir_apiv1.SendConfigResponse_ConfigResponse
-	vp      viewport.Model
-	list    menu.Model
+	ctx      context.Context
+	help     mir_help.Model
+	cfgReq   *mir_apiv1.SendConfigRequest
+	cfgResp  map[string]*mir_apiv1.SendConfigResponse_ConfigResponse
+	fetching bool
+	vp       viewport.Model
+	list     menu.Model
 }
 
 func NewModel(ctx context.Context) *Model {
@@ -64,6 +65,7 @@ func (m *Model) InitWithData(d any) tea.Cmd {
 		)
 	}
 	m.cfgReq = req
+	m.fetching = true
 
 	return tea.Batch(
 		msgs.ReqMsgCmd("Config '"+req.Name+"' sent to "+strconv.Itoa(len(req.Targets.Ids))+" devices", msgs.DefaultTimeout),
@@ -99,6 +101,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case msgs.DeviceConfigSentMsg:
 		m.cfgResp = msg.ConfigsResponses
 		m.list = menu.New(m.renderCmdResp(m.cfgResp))
+		m.fetching = false
 		cmdRes = msgs.ResMsgCmd(strconv.Itoa(len(msg.ConfigsResponses))+" config responses received", 5*time.Second)
 	case tea.KeyMsg:
 		m.help, cmdKey = m.help.Update(msg)
@@ -141,7 +144,12 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 func (m *Model) View() string {
 	v.Reset()
-	header := styles.Help.Bold(false).Render(fmt.Sprintf("Configuration responses for %d devices\n", len(m.cfgResp)))
+	header := ""
+	if m.fetching {
+		header = styles.Help.Bold(false).Render(fmt.Sprintf("Sending config '%s'...\n", m.cfgReq.Name))
+	} else {
+		header = styles.Help.Bold(false).Render(fmt.Sprintf("Configuration responses for %d devices\n", len(m.cfgResp)))
+	}
 	m.vp.SetContent(header + m.list.View())
 	v.WriteString(m.vp.View())
 	v.WriteString(m.help.View())

internal/ui/tui/pages/device/cfg/values/values.go

@@ -29,13 +29,14 @@ var (
 )
 
 type Model struct {
-	ctx     context.Context
-	help    mir_help.Model
-	devCfgs []*mir_apiv1.DevicesConfigs_ConfigValues
-	cfgName string
-	targets *mir_apiv1.DeviceTarget
-	vp      viewport.Model
-	list    menu.Model
+	ctx      context.Context
+	help     mir_help.Model
+	devCfgs  []*mir_apiv1.DevicesConfigs_ConfigValues
+	cfgName  string
+	targets  *mir_apiv1.DeviceTarget
+	fetching bool
+	vp       viewport.Model
+	list     menu.Model
 }
 
 type InputData struct {
@@ -71,6 +72,7 @@ func (m *Model) InitWithData(d any) tea.Cmd {
 	}
 	m.cfgName = req.CfgName
 	m.targets = req.Targets
+	m.fetching = true
 
 	return tea.Batch(
 		msgs.ReqMsgCmd("Config '"+req.CfgName+"' sent to "+strconv.Itoa(len(req.Targets.Ids))+" devices", msgs.DefaultTimeout),
@@ -106,6 +108,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.devCfgs = append(m.devCfgs, cfg.CfgValues...)
 		}
 		m.list = menu.New(m.renderCfgValues(m.cfgName, m.devCfgs))
+		m.fetching = false
 		cmdRes = msgs.ResMsgCmd(fmt.Sprintf("%d configs fetched on %d devices", len(msg.Configs), len(m.targets.Ids)), msgs.DefaultTimeout)
 	case tea.WindowSizeMsg:
 		dims := utils.DefaultViewportDimensions()
@@ -135,7 +138,14 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 func (m *Model) View() string {
 	v.Reset()
-	header := styles.Help.Bold(false).Render(fmt.Sprintf("Configuration values for %d devices\n", len(m.targets.Ids)))
+
+	header := ""
+	if m.fetching {
+		header = styles.Help.Bold(false).Render(fmt.Sprintf("Fetching config '%s'...\n", m.cfgName))
+	} else {
+		header = styles.Help.Bold(false).Render(fmt.Sprintf("Configuration values for %d devices\n", len(m.targets.Ids)))
+	}
+
 	m.vp.SetContent(header + m.list.View())
 	v.WriteString(m.vp.View())
 	v.WriteString(m.help.View())

internal/ui/tui/pages/device/cmd/response/resp.go

@@ -29,12 +29,13 @@ var (
 )
 
 type Model struct {
-	ctx     context.Context
-	help    mir_help.Model
-	cmdReq  *mir_apiv1.SendCommandRequest
-	cmdResp map[string]*mir_apiv1.SendCommandResponse_CommandResponse
-	vp      viewport.Model
-	list    menu.Model
+	ctx      context.Context
+	help     mir_help.Model
+	cmdReq   *mir_apiv1.SendCommandRequest
+	cmdResp  map[string]*mir_apiv1.SendCommandResponse_CommandResponse
+	fetching bool
+	vp       viewport.Model
+	list     menu.Model
 }
 
 func NewModel(ctx context.Context) *Model {
@@ -64,6 +65,7 @@ func (m *Model) InitWithData(d any) tea.Cmd {
 		)
 	}
 	m.cmdReq = req
+	m.fetching = true
 
 	return tea.Batch(
 		msgs.ReqMsgCmd("Command '"+req.Name+"' sent to "+strconv.Itoa(len(req.Targets.Ids))+" devices", msgs.DefaultTimeout),
@@ -99,6 +101,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case msgs.DeviceCommandSentMsg:
 		m.cmdResp = msg.CommandsResponse
 		m.list = menu.New(m.renderCmdResp(m.cmdResp))
+		m.fetching = false
 		cmdRes = msgs.ResMsgCmd(strconv.Itoa(len(msg.CommandsResponse))+" command responses received", 5*time.Second)
 	case tea.KeyMsg:
 		m.help, cmdKey = m.help.Update(msg)
@@ -141,7 +144,12 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 func (m *Model) View() string {
 	v.Reset()
-	header := styles.Help.Bold(false).Render(fmt.Sprintf("Command responses for %d devices\n", len(m.cmdResp)))
+	header := ""
+	if m.fetching {
+		header = styles.Help.Bold(false).Render(fmt.Sprintf("Sending command '%s'...\n", m.cmdReq.Name))
+	} else {
+		header = styles.Help.Bold(false).Render(fmt.Sprintf("Command responses for %d devices\n", len(m.cmdResp)))
+	}
 	m.vp.SetContent(header + m.list.View())
 	v.WriteString(m.vp.View())
 	v.WriteString(m.help.View())

internal/ui/tui/router.go

@@ -50,7 +50,7 @@ type Model struct {
 
 func NewModel(ctx context.Context, log zerolog.Logger, m *mir.Mir, cfg ui.Config) *Model {
 	log = log.With().Str("page", "router").Logger()
-	s := labelspinner.New(" 🛰️ ", styles.Mir.Render("Mir"), spinner.Dot)
+	s := labelspinner.New(" 🛰️ ", styles.Mir.Render("Mir ("+store.MirCtx.Name+")"), spinner.Dot)
 	routes := map[string]MirTeaModel{
 		"/":                                mainmenu.NewModel(),
 		"/devices":                         device_list.NewModel(ctx),