mirror of
https://github.com/weaveworks/scope.git
synced 2026-08-23 22:36:24 +00:00
rename LabelMajor to Label
This commit is contained in:
@@ -244,7 +244,7 @@ export default class NodesChart extends React.Component {
|
||||
// copy relevant fields to state nodes
|
||||
return topology.map((node, id) => makeMap({
|
||||
id,
|
||||
label: node.get('label_major'),
|
||||
label: node.get('label'),
|
||||
pseudo: node.get('pseudo'),
|
||||
subLabel: node.get('label_minor'),
|
||||
nodeCount: node.get('node_count'),
|
||||
|
||||
@@ -21,7 +21,7 @@ const deltaAdd = (name, adjacency = [], shape = 'circle', stack = false, nodeCou
|
||||
stack,
|
||||
node_count: nodeCount,
|
||||
id: name,
|
||||
label_major: name,
|
||||
label: name,
|
||||
label_minor: 'weave-1',
|
||||
latest: {},
|
||||
metadata: {},
|
||||
|
||||
@@ -8,9 +8,9 @@ import { DETAILS_PANEL_WIDTH, DETAILS_PANEL_MARGINS,
|
||||
export default function EmeddedTerminal({pipe, nodeId, details}) {
|
||||
const node = details.get(nodeId);
|
||||
const d = node && node.details;
|
||||
const titleBarColor = d && getNodeColorDark(d.rank, d.label_major);
|
||||
const statusBarColor = d && getNodeColor(d.rank, d.label_major);
|
||||
const title = d && d.label_major;
|
||||
const titleBarColor = d && getNodeColorDark(d.rank, d.label);
|
||||
const statusBarColor = d && getNodeColor(d.rank, d.label);
|
||||
const title = d && d.label;
|
||||
|
||||
const style = {
|
||||
right: DETAILS_PANEL_MARGINS.right + DETAILS_PANEL_WIDTH + 10 +
|
||||
|
||||
@@ -54,7 +54,7 @@ export default class NodeDetails extends React.Component {
|
||||
|
||||
renderLoading() {
|
||||
const node = this.props.nodes.get(this.props.nodeId);
|
||||
const label = node ? node.get('label_major') : this.props.label;
|
||||
const label = node ? node.get('label') : this.props.label;
|
||||
const nodeColor = (node ?
|
||||
getNodeColorDark(node.get('rank'), label, node.get('pseudo')) :
|
||||
getNeutralColor());
|
||||
|
||||
@@ -17,7 +17,7 @@ describe('AppStore', () => {
|
||||
rank: undefined,
|
||||
adjacency: ['n1', 'n2'],
|
||||
pseudo: undefined,
|
||||
label_major: undefined,
|
||||
label: undefined,
|
||||
label_minor: undefined
|
||||
},
|
||||
n2: {
|
||||
@@ -25,7 +25,7 @@ describe('AppStore', () => {
|
||||
rank: undefined,
|
||||
adjacency: undefined,
|
||||
pseudo: undefined,
|
||||
label_major: undefined,
|
||||
label: undefined,
|
||||
label_minor: undefined
|
||||
}
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@ const error = debug('scope:error');
|
||||
function makeNode(node) {
|
||||
return {
|
||||
id: node.id,
|
||||
label_major: node.label_major,
|
||||
label: node.label,
|
||||
label_minor: node.label_minor,
|
||||
node_count: node.node_count,
|
||||
rank: node.rank,
|
||||
|
||||
Reference in New Issue
Block a user