Use Context based SplitView to list plugins

cli/core/go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/aunum/log v0.0.0-20200821225356-38d2e2c8b489
 	github.com/briandowns/spinner v1.19.0
 	github.com/cppforlife/go-cli-ui v0.0.0-20200716203538-1e47f820817f
+	github.com/fatih/color v1.13.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/gnostic v0.5.7-v3refs
 	github.com/google/go-containerregistry v0.7.0
@@ -73,7 +74,6 @@ require (
 	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/emicklei/go-restful v2.15.0+incompatible // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-logr/logr v1.2.2 // indirect

cli/core/pkg/command/plugin_manager.go

@@ -5,9 +5,14 @@ package command
 
 import (
 	"fmt"
+	"io"
 	"path/filepath"
 	"sort"
 
+	"github.com/fatih/color"
+
+	"github.com/vmware-tanzu/tanzu-framework/cli/core/pkg/common"
+
 	cliv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/cli/v1alpha1"
 
 	"github.com/aunum/log"
@@ -22,7 +27,7 @@ import (
 	"github.com/vmware-tanzu/tanzu-framework/cli/core/pkg/pluginmanager"
 	cliapi "github.com/vmware-tanzu/tanzu-framework/cli/runtime/apis/cli/v1alpha1"
 	"github.com/vmware-tanzu/tanzu-framework/cli/runtime/command"
-	"github.com/vmware-tanzu/tanzu-framework/cli/runtime/component"
+	component "github.com/vmware-tanzu/tanzu-framework/cli/runtime/component"
 	"github.com/vmware-tanzu/tanzu-framework/cli/runtime/config"
 )
 
@@ -92,31 +97,11 @@ var listPluginCmd = &cobra.Command{
 			return err
 		}
 
-		var data [][]string
-		var output component.OutputWriter
-
-		if config.IsFeatureActivated(cliconfig.FeatureContextCommand) {
-			for index := range availablePlugins {
-				data = append(data, []string{availablePlugins[index].Name, availablePlugins[index].Description, availablePlugins[index].Scope,
-					availablePlugins[index].Source, string(availablePlugins[index].Target), getInstalledElseAvailablePluginVersion(&availablePlugins[index]), availablePlugins[index].Status})
-			}
-			output = component.NewOutputWriter(cmd.OutOrStdout(), outputFormat, "Name", "Description", "Scope", "Discovery", "Target", "Version", "Status")
+		if config.IsFeatureActivated(cliconfig.FeatureContextCommand) && (outputFormat == "" || outputFormat == string(component.TableOutputType)) {
+			displayPluginListOutputSplitViewContext(availablePlugins, cmd.OutOrStdout())
 		} else {
-			for index := range availablePlugins {
-				data = append(data, []string{availablePlugins[index].Name, availablePlugins[index].Description, availablePlugins[index].Scope,
-					availablePlugins[index].Source, getInstalledElseAvailablePluginVersion(&availablePlugins[index]), availablePlugins[index].Status})
-			}
-			output = component.NewOutputWriter(cmd.OutOrStdout(), outputFormat, "Name", "Description", "Scope", "Discovery", "Version", "Status")
-		}
-
-		for _, row := range data {
-			vals := make([]interface{}, len(row))
-			for i, val := range row {
-				vals[i] = val
-			}
-			output.AddRow(vals...)
+			displayPluginListOutputListView(availablePlugins, cmd.OutOrStdout())
 		}
-		output.Render()
 
 		return nil
 
@@ -398,3 +383,72 @@ func getInstalledElseAvailablePluginVersion(p *plugin.Discovered) string {
 	}
 	return installedOrAvailableVersion
 }
+
+func displayPluginListOutputListView(availablePlugins []plugin.Discovered, writer io.Writer) {
+	var data [][]string
+	var output component.OutputWriter
+
+	for index := range availablePlugins {
+		data = append(data, []string{availablePlugins[index].Name, availablePlugins[index].Description, availablePlugins[index].Scope,
+			availablePlugins[index].Source, getInstalledElseAvailablePluginVersion(&availablePlugins[index]), availablePlugins[index].Status})
+	}
+	output = component.NewOutputWriter(writer, outputFormat, "Name", "Description", "Scope", "Discovery", "Version", "Status")
+
+	for _, row := range data {
+		vals := make([]interface{}, len(row))
+		for i, val := range row {
+			vals[i] = val
+		}
+		output.AddRow(vals...)
+	}
+	output.Render()
+}
+
+func displayPluginListOutputSplitViewContext(availablePlugins []plugin.Discovered, writer io.Writer) {
+	var dataStandalone [][]string
+	var outputStandalone component.OutputWriter
+	dataContext := make(map[string][][]string)
+	outputContext := make(map[string]component.OutputWriter)
+
+	outputStandalone = component.NewOutputWriter(writer, outputFormat, "Name", "Description", "Target", "Discovery", "Version", "Status")
+
+	for index := range availablePlugins {
+		if availablePlugins[index].Scope == common.PluginScopeStandalone {
+			newRow := []string{availablePlugins[index].Name, availablePlugins[index].Description, string(availablePlugins[index].Target),
+				availablePlugins[index].Source, getInstalledElseAvailablePluginVersion(&availablePlugins[index]), availablePlugins[index].Status}
+			dataStandalone = append(dataStandalone, newRow)
+		} else {
+			newRow := []string{availablePlugins[index].Name, availablePlugins[index].Description, string(availablePlugins[index].Target),
+				getInstalledElseAvailablePluginVersion(&availablePlugins[index]), availablePlugins[index].Status}
+			outputContext[availablePlugins[index].ContextName] = component.NewOutputWriter(writer, outputFormat, "Name", "Description", "Target", "Version", "Status")
+			data := dataContext[availablePlugins[index].ContextName]
+			data = append(data, newRow)
+			dataContext[availablePlugins[index].ContextName] = data
+		}
+	}
+
+	addDataToOutputWriter := func(output component.OutputWriter, data [][]string) {
+		for _, row := range data {
+			vals := make([]interface{}, len(row))
+			for i, val := range row {
+				vals[i] = val
+			}
+			output.AddRow(vals...)
+		}
+	}
+
+	cyanBold := color.New(color.FgCyan).Add(color.Bold)
+	cyanBoldItalic := color.New(color.FgCyan).Add(color.Bold, color.Italic)
+
+	_, _ = cyanBold.Println("Standalone Plugins")
+	addDataToOutputWriter(outputStandalone, dataStandalone)
+	outputStandalone.Render()
+
+	for context, writer := range outputContext {
+		fmt.Println("")
+		_, _ = cyanBold.Println("Context Plugins: ", cyanBoldItalic.Sprintf(context))
+		data := dataContext[context]
+		addDataToOutputWriter(writer, data)
+		writer.Render()
+	}
+}