added loadID check to completion command #82

internal/resource/commands.go

@@ -32,4 +32,6 @@ type ErrorMsg struct {
 	Err error
 }
 
-type CommandCompletedMsg struct{}
+type CommandCompletedMsg struct {
+	LoadID uint64
+}

internal/ui/app.go

@@ -554,8 +554,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return m, nil
 
 	case resource.CommandCompletedMsg:
-		//m.showLoading = false
-		//m.loadingLabel = ""
+		if msg.LoadID != m.loadID {
+			return m, nil
+		}
+
+		m.showLoading = false
+		m.loadingLabel = ""
 		return m, nil
 
 	}

internal/ui/commands.go

@@ -116,14 +116,17 @@ func (m *Model) executeResourceCommand(key string) tea.Cmd {
 				m.loadingLabel = "Connecting to " + row.ID
 			}
 
+			loadID := m.loadID
 			cmd := m.resource.Execute(command, row)
 
 			return tea.Batch(
 				m.spinner.Tick,
 				tea.Sequence(
 					cmd,
 					func() tea.Msg {
-						return resource.CommandCompletedMsg{}
+						return resource.CommandCompletedMsg{
+							LoadID: loadID,
+						}
 					},
 				),
 			)