From d3b11ee040b35547d81b797c455e40d770cbb152 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Wed, 27 Jan 2016 19:40:31 -0800
Subject: [PATCH] Rename Applications -> Process, sort topologies by rank.

---
 app/api_topologies.go                       | 13 +++++++++----
 app/api_topology_test.go                    | 10 +++++-----
 client/app/scripts/components/topologies.js |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/api_topologies.go b/app/api_topologies.go
index ce598defb..37f4f20eb 100644
--- a/app/api_topologies.go
+++ b/app/api_topologies.go
@@ -22,6 +22,7 @@ var (
 			id:       "pods",
 			renderer: render.PodRenderer,
 			Name:     "Pods",
+			Rank:     3,
 			Options: map[string][]APITopologyOption{"system": {
 				{"show", "System pods shown", false, render.FilterNoop},
 				{"hide", "System pods hidden", true, render.FilterSystem},
@@ -56,9 +57,10 @@ func init() {
 	// be the verb to get to that state
 	topologyRegistry.add(
 		APITopologyDesc{
-			id:       "applications",
+			id:       "processes",
 			renderer: render.FilterUnconnected(render.ProcessWithContainerNameRenderer),
-			Name:     "Applications",
+			Name:     "Processes",
+			Rank:     1,
 			Options: map[string][]APITopologyOption{"unconnected": {
 				// Show the user why there are filtered nodes in this view.
 				// Don't give them the option to show those nodes.
@@ -66,8 +68,8 @@ func init() {
 			}},
 		},
 		APITopologyDesc{
-			id:       "applications-by-name",
-			parent:   "applications",
+			id:       "processes-by-name",
+			parent:   "processes",
 			renderer: render.FilterUnconnected(render.ProcessNameRenderer),
 			Name:     "by name",
 			Options: map[string][]APITopologyOption{"unconnected": {
@@ -79,6 +81,7 @@ func init() {
 			id:       "containers",
 			renderer: render.ContainerWithImageNameRenderer,
 			Name:     "Containers",
+			Rank:     2,
 			Options:  containerFilters,
 		},
 		APITopologyDesc{
@@ -99,6 +102,7 @@ func init() {
 			id:       "hosts",
 			renderer: render.HostRenderer,
 			Name:     "Hosts",
+			Rank:     4,
 			Options:  map[string][]APITopologyOption{},
 		},
 	)
@@ -117,6 +121,7 @@ type APITopologyDesc struct {
 	renderer render.Renderer
 
 	Name    string                         `json:"name"`
+	Rank    int                            `json:"rank"`
 	Options map[string][]APITopologyOption `json:"options"`
 
 	URL           string            `json:"url"`
diff --git a/app/api_topology_test.go b/app/api_topology_test.go
index 0282710fa..1f36171db 100644
--- a/app/api_topology_test.go
+++ b/app/api_topology_test.go
@@ -71,12 +71,12 @@ func TestAPITopologyContainers(t *testing.T) {
 	}
 }
 
-func TestAPITopologyApplications(t *testing.T) {
+func TestAPITopologyProcesses(t *testing.T) {
 	ts := topologyServer()
 	defer ts.Close()
-	is404(t, ts, "/api/topology/applications/foobar")
+	is404(t, ts, "/api/topology/processes/foobar")
 	{
-		body := getRawJSON(t, ts, "/api/topology/applications/"+expected.ServerProcessID)
+		body := getRawJSON(t, ts, "/api/topology/processes/"+expected.ServerProcessID)
 		var node app.APINode
 		if err := json.Unmarshal(body, &node); err != nil {
 			t.Fatal(err)
@@ -88,7 +88,7 @@ func TestAPITopologyApplications(t *testing.T) {
 	}
 
 	{
-		body := getRawJSON(t, ts, "/api/topology/applications-by-name/"+
+		body := getRawJSON(t, ts, "/api/topology/processes-by-name/"+
 			url.QueryEscape(fixture.Client1Name))
 		var node app.APINode
 		if err := json.Unmarshal(body, &node); err != nil {
@@ -133,7 +133,7 @@ func TestAPITopologyHosts(t *testing.T) {
 func TestAPITopologyWebsocket(t *testing.T) {
 	ts := topologyServer()
 	defer ts.Close()
-	url := "/api/topology/applications/ws"
+	url := "/api/topology/processes/ws"
 
 	// Not a websocket request
 	res, _ := checkGet(t, ts, url)
diff --git a/client/app/scripts/components/topologies.js b/client/app/scripts/components/topologies.js
index 3566d2b34..cc99cc198 100644
--- a/client/app/scripts/components/topologies.js
+++ b/client/app/scripts/components/topologies.js
@@ -58,7 +58,7 @@ export default class Topologies extends React.Component {
 
   render() {
     const topologies = _.sortBy(this.props.topologies, function(topology) {
-      return topology.name;
+      return topology.rank;
     });
 
     return (