diff --git a/client/app/scripts/components/node-details/node-details-table-node-link.js b/client/app/scripts/components/node-details/node-details-table-node-link.js index 0ecd15aeb..1c3303b9b 100644 --- a/client/app/scripts/components/node-details/node-details-table-node-link.js +++ b/client/app/scripts/components/node-details/node-details-table-node-link.js @@ -32,24 +32,17 @@ class NodeDetailsTableNodeLink extends React.Component { } render() { - const { label, labelMinor, linkable } = this.props; + const { label, labelMinor } = this.props; const title = !labelMinor ? label : `${label} (${labelMinor})`; - if (linkable) { - return ( - - {label} - - ); - } return ( - + {label} ); diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index 11fafc6ed..aa6f86f39 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -37,9 +37,7 @@ func TestMakeDetailedHostNode(t *testing.T) { containerImageNodeSummary := child(t, render.ContainerImageRenderer, expected.ClientContainerImageNodeID) containerNodeSummary := child(t, render.ContainerRenderer, fixture.ClientContainerNodeID) process1NodeSummary := child(t, render.ProcessRenderer, fixture.ClientProcess1NodeID) - process1NodeSummary.Linkable = true process2NodeSummary := child(t, render.ProcessRenderer, fixture.ClientProcess2NodeID) - process2NodeSummary.Linkable = true podNodeSummary := child(t, render.PodRenderer, fixture.ClientPodNodeID) want := detailed.Node{ NodeSummary: detailed.NodeSummary{ @@ -50,7 +48,6 @@ func TestMakeDetailedHostNode(t *testing.T) { Rank: "hostname.com", Pseudo: false, Shape: "circle", - Linkable: true, }, Adjacency: report.MakeIDList(fixture.ServerHostNodeID), Metadata: []report.MetadataRow{ @@ -188,7 +185,6 @@ func TestMakeDetailedContainerNode(t *testing.T) { have := detailed.MakeNode("containers", detailed.RenderContext{Report: fixture.Report}, renderableNodes, renderableNode) serverProcessNodeSummary := child(t, render.ProcessRenderer, fixture.ServerProcessNodeID) - serverProcessNodeSummary.Linkable = true want := detailed.Node{ NodeSummary: detailed.NodeSummary{ BasicNodeSummary: detailed.BasicNodeSummary{ @@ -197,7 +193,6 @@ func TestMakeDetailedContainerNode(t *testing.T) { LabelMinor: "server.hostname.com", Rank: fixture.ServerContainerImageName, Shape: "hexagon", - Linkable: true, Pseudo: false, }, Metadata: []report.MetadataRow{ @@ -321,7 +316,6 @@ func TestMakeDetailedPodNode(t *testing.T) { containerNodeSummary := child(t, render.ContainerWithImageNameRenderer, fixture.ServerContainerNodeID) serverProcessNodeSummary := child(t, render.ProcessRenderer, fixture.ServerProcessNodeID) - serverProcessNodeSummary.Linkable = true // Temporary workaround for: https://github.com/weaveworks/scope/issues/1295 want := detailed.Node{ NodeSummary: detailed.NodeSummary{ BasicNodeSummary: detailed.BasicNodeSummary{ @@ -330,7 +324,6 @@ func TestMakeDetailedPodNode(t *testing.T) { LabelMinor: "1 container", Rank: "ping/pong-b", Shape: "heptagon", - Linkable: true, Pseudo: false, }, Metadata: []report.MetadataRow{ diff --git a/render/detailed/summary.go b/render/detailed/summary.go index b73d43da1..038217534 100644 --- a/render/detailed/summary.go +++ b/render/detailed/summary.go @@ -50,7 +50,6 @@ type BasicNodeSummary struct { Rank string `json:"rank"` Shape string `json:"shape,omitempty"` Stack bool `json:"stack,omitempty"` - Linkable bool `json:"linkable,omitempty"` // Whether this node can be linked-to Pseudo bool `json:"pseudo,omitempty"` } @@ -104,10 +103,9 @@ var primaryAPITopology = map[string]string{ // possible. This summary is sufficient for rendering links to the node. func MakeBasicNodeSummary(r report.Report, n report.Node) (BasicNodeSummary, bool) { summary := BasicNodeSummary{ // This is unlikely to look very good, but is a reasonable fallback - ID: n.ID, - Label: n.ID, - Shape: report.Triangle, - Linkable: true, + ID: n.ID, + Label: n.ID, + Shape: report.Triangle, } if t, ok := r.Topology(n.Topology); ok { summary.Shape = t.GetShape() diff --git a/render/detailed/summary_test.go b/render/detailed/summary_test.go index 2044723ca..057f61ad0 100644 --- a/render/detailed/summary_test.go +++ b/render/detailed/summary_test.go @@ -130,7 +130,6 @@ func TestMakeNodeSummary(t *testing.T) { LabelMinor: fixture.ClientHostName, Rank: fixture.ClientContainerImageName, Shape: "hexagon", - Linkable: true, }, Metadata: []report.MetadataRow{ {ID: docker.ImageName, Label: "Image", Value: fixture.ClientContainerImageName, Priority: 1}, @@ -150,7 +149,6 @@ func TestMakeNodeSummary(t *testing.T) { LabelMinor: "1 container", Rank: fixture.ClientContainerImageName, Shape: "hexagon", - Linkable: true, Stack: true, }, Metadata: []report.MetadataRow{ @@ -170,7 +168,6 @@ func TestMakeNodeSummary(t *testing.T) { LabelMinor: "hostname.com", Rank: "hostname.com", Shape: "circle", - Linkable: true, }, Metadata: []report.MetadataRow{ {ID: host.HostName, Label: "Hostname", Value: fixture.ClientHostName, Priority: 11}, @@ -190,7 +187,6 @@ func TestMakeNodeSummary(t *testing.T) { Rank: "apache", Shape: "square", Stack: true, - Linkable: true, }, }, },