support command status labels for in-tree and plugin resources #77

internal/plugins/resource.go

@@ -60,6 +60,7 @@ func (r *pluginResource) Commands() []resource.Command {
 			Key:         command.Key,
 			Description: command.Description,
 			Default:     command.Default,
+			StatusLabel: command.StatusLabel,
 		})
 	}
 
@@ -92,6 +93,7 @@ func (r *pluginResource) Execute(command resource.Command, row resource.Row) tea
 			Key:         command.Key,
 			Description: command.Description,
 			Default:     command.Default,
+			StatusLabel: command.StatusLabel,
 		}, pluginsdk.Row{
 			ID:     row.ID,
 			Fields: row.Fields,

internal/resource/commands.go

@@ -31,3 +31,5 @@ type NavigateScopedMsg struct {
 type ErrorMsg struct {
 	Err error
 }
+
+type CommandCompletedMsg struct{}

internal/resource/resource.go

@@ -22,6 +22,7 @@ type Command struct {
 	Key         string
 	Description string
 	Default     bool
+	StatusLabel string
 }
 
 type Resource interface {

internal/ui/app.go

@@ -536,6 +536,11 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		return m, nil
 
+	case resource.CommandCompletedMsg:
+		m.showLoading = false
+		m.loadingLabel = ""
+		return m, nil
+
 	}
 
 	var cmd tea.Cmd

internal/ui/commands.go

@@ -104,18 +104,26 @@ func (m *Model) executeResourceCommand(key string) tea.Cmd {
 		if command.Key == key {
 			row := m.resourceRows[cursor]
 
+			m.showLoading = true
+			m.loadingLabel = command.StatusLabel
+			if m.loadingLabel == "" {
+				m.loadingLabel = "Loading..."
+			}
+
 			if m.resource.Kind() == "contexts" && key == "a" {
 				m.activatingContext = true
 				m.showLoading = true
 				m.loadingLabel = "Connecting to " + row.ID + "..."
 			}
 
-			if key == "s" {
-				m.showLoading = true
-				m.loadingLabel = "Loading..."
-			}
+			cmd := m.resource.Execute(command, row)
 
-			return m.resource.Execute(command, row)
+			return tea.Sequence(
+				cmd,
+				func() tea.Msg {
+					return resource.CommandCompletedMsg{}
+				},
+			)
 		}
 	}
 

pluginsdk/grpc_client.go

@@ -85,6 +85,7 @@ func (r *grpcResource) Commands() []Command {
 			Key:         command.Key,
 			Description: command.Description,
 			Default:     command.Default,
+			StatusLabel: command.StatusLabel,
 		})
 	}
 
@@ -119,6 +120,7 @@ func (r *grpcResource) Execute(ctx context.Context, command Command, row Row) (R
 			Key:         command.Key,
 			Description: command.Description,
 			Default:     command.Default,
+			StatusLabel: command.StatusLabel,
 		},
 		Row: &pb.Row{
 			Id:     row.ID,

pluginsdk/grpc_server.go

@@ -63,6 +63,7 @@ func (s *grpcServer) GetResources(context.Context, *pb.Empty) (*pb.Resources, er
 				Key:         command.Key,
 				Description: command.Description,
 				Default:     command.Default,
+				StatusLabel: command.StatusLabel,
 			})
 		}
 
@@ -124,6 +125,7 @@ func (s *grpcServer) Execute(ctx context.Context, request *pb.ExecuteRequest) (*
 		Key:         request.Command.Key,
 		Description: request.Command.Description,
 		Default:     request.Command.Default,
+		StatusLabel: request.Command.StatusLabel,
 	}, Row{
 		ID:     request.Row.Id,
 		Fields: request.Row.Fields,

pluginsdk/plugin.go

@@ -49,6 +49,7 @@ type Command struct {
 	Key         string
 	Description string
 	Default     bool
+	StatusLabel string
 }
 
 type Resource interface {

pluginsdk/proto/plugin.proto

@@ -59,6 +59,7 @@ message Command {
   string key = 1;
   string description = 2;
   bool default = 3;
+  string status_label = 4;
 }
 
 message Row {