Renamed and moved resource view components

weaveworks · Mar 17, 2017 · 65fb838 · 65fb838
1 parent ff16b3a
commit 65fb838
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 25 deletions.
diff --git a/client/app/scripts/components/cachable-zoom-wrapper.js b/client/app/scripts/components/cachable-zoom-wrapper.js
@@ -147,7 +147,6 @@ class CachableZoomWrapper extends React.Component {
 
   zoomed() {
     if (!this.props.disabled) {
-      console.log('Current zoom', d3Event.transform.x, d3Event.transform.k);
       const updatedState = this.cachableState({
         scaleX: d3Event.transform.k,
         scaleY: d3Event.transform.k,

diff --git a/client/app/scripts/charts/nodes-resources.js → ...app/scripts/components/nodes-resources.js b/client/app/scripts/charts/nodes-resources.js → ...app/scripts/components/nodes-resources.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import Logo from '../components/logo';
+import Logo from './logo';
 import { layersTopologyIdsSelector } from '../selectors/resource-view/layers';
-import CachableZoomWrapper from '../components/cachable-zoom-wrapper';
-import NodesResourcesLayer from './nodes-resources-layer';
+import CachableZoomWrapper from './cachable-zoom-wrapper';
+import NodesResourcesLayer from './nodes-resources/node-resources-layer';
 
 
 class NodesResources extends React.Component {

diff --git a/...pp/scripts/charts/layer-labels-overlay.js → ...es/node-resources-layer-labels-overlay.js b/...pp/scripts/charts/layer-labels-overlay.js → ...es/node-resources-layer-labels-overlay.js
@@ -1,13 +1,13 @@
 import React from 'react';
 import { fromJS } from 'immutable';
 
-import NodeResourceInfo from './node-resource-info';
-import { applyTransformX, applyTransformY } from '../utils/transform-utils';
+import NodeResourcesMetricBoxInfo from './node-resources-metric-box-info';
+import { applyTransformX, applyTransformY } from '../../utils/transform-utils';
 import {
   RESOURCES_LAYER_TITLE_WIDTH,
   RESOURCES_LABEL_MIN_SIZE,
   RESOURCES_LABEL_PADDING,
-} from '../constants/styles';
+} from '../../constants/styles';
 
 
 export default class LayerLabelsOverlay extends React.Component {
@@ -39,7 +39,7 @@ export default class LayerLabelsOverlay extends React.Component {
     return (
       <g className="labels-overlay">
         {this.positionedLabels().map(label => (
-          <NodeResourceInfo
+          <NodeResourcesMetricBoxInfo
             key={label.getIn(['node', 'id'])}
             node={label.get('node')}
             width={label.get('width')}

diff --git a/...app/scripts/charts/layer-topology-name.js → ...esources/node-resources-layer-topology.js b/...app/scripts/charts/layer-topology-name.js → ...esources/node-resources-layer-topology.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { RESOURCES_LAYER_TITLE_WIDTH, RESOURCES_LAYER_HEIGHT } from '../constants/styles';
-import { applyTransformY } from '../utils/transform-utils';
+import { RESOURCES_LAYER_TITLE_WIDTH, RESOURCES_LAYER_HEIGHT } from '../../constants/styles';
+import { applyTransformY } from '../../utils/transform-utils';
 
 export default class LayerTopologyName extends React.Component {
   render() {

diff --git a/...p/scripts/charts/nodes-resources-layer.js → ...s/nodes-resources/node-resources-layer.js b/...p/scripts/charts/nodes-resources-layer.js → ...s/nodes-resources/node-resources-layer.js
@@ -2,13 +2,13 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { Map as makeMap } from 'immutable';
 
-import NodeResourceBox from './node-resource-box';
-import LayerLabelsOverlay from './layer-labels-overlay';
-import LayerTopologyName from './layer-topology-name';
+import NodeResourcesMetricBox from './node-resources-metric-box';
+import NodeResourcesLayerLabelsOverlay from './node-resources-layer-labels-overlay';
+import NodeResourcesLayerTopology from './node-resources-layer-topology';
 import {
   layersVerticalPositionSelector,
   positionedNodesByTopologySelector,
-} from '../selectors/resource-view/layers';
+} from '../../selectors/resource-view/layers';
 
 
 // const stringifiedTransform = ({ scaleX = 1, scaleY = 1, translateX = 0, translateY = 0 }) => (
@@ -23,7 +23,7 @@ class NodesResourcesLayer extends React.Component {
       <g className="node-resource-layer">
         <g>
           {nodes.toIndexedSeq().map(node => (
-            <NodeResourceBox
+            <NodeResourcesMetricBox
               key={node.get('id')}
               color={node.get('color')}
               width={node.get('width')}
@@ -36,12 +36,12 @@ class NodesResourcesLayer extends React.Component {
             />
           ))}
         </g>
-        <LayerLabelsOverlay
+        <NodeResourcesLayerLabelsOverlay
           verticalOffset={layerVerticalPosition}
           transform={transform}
           nodes={nodes}
         />
-        {!nodes.isEmpty() && <LayerTopologyName
+        {!nodes.isEmpty() && <NodeResourcesLayerTopology
           verticalOffset={layerVerticalPosition}
           transform={transform}
           topologyId={topologyId}

diff --git a/.../app/scripts/charts/node-resource-info.js → ...sources/node-resources-metric-box-info.js b/.../app/scripts/charts/node-resource-info.js → ...sources/node-resources-metric-box-info.js
@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { getHumanizedMetricInfo } from '../utils/metric-utils';
+import { getHumanizedMetricInfo } from '../../utils/metric-utils';
 
 
 const HEIGHT = '45px';
 
-export default class NodeResourceInfo extends React.Component {
+export default class NodeResourcesMetricBoxInfo extends React.Component {
   render() {
     const { node, width, x, y } = this.props;
     const humanizedMetricInfo = getHumanizedMetricInfo(node.get('activeMetric'));

diff --git a/...t/app/scripts/charts/node-resource-box.js → ...es-resources/node-resources-metric-box.js b/...t/app/scripts/charts/node-resource-box.js → ...es-resources/node-resources-metric-box.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 
-class NodeResourceBox extends React.Component {
+class NodeResourcesMetricBox extends React.Component {
   defaultRectProps(relativeHeight = 1) {
     const { translateX, translateY, scaleX, scaleY } = this.props.transform;
     const innerTranslateY = this.props.height * scaleY * (1 - relativeHeight);
@@ -41,4 +41,4 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(mapStateToProps)(NodeResourceBox);
+export default connect(mapStateToProps)(NodeResourcesMetricBox);
diff --git a/client/app/scripts/components/nodes.js b/client/app/scripts/components/nodes.js
@@ -4,7 +4,7 @@ import { debounce } from 'lodash';
 
 import NodesChart from '../charts/nodes-chart';
 import NodesGrid from '../charts/nodes-grid';
-import NodesResources from '../charts/nodes-resources';
+import NodesResources from '../components/nodes-resources';
 import NodesError from '../charts/nodes-error';
 import DelayedShow from '../utils/delayed-show';
 import { Loading, getNodeType } from './loading';

diff --git a/client/app/scripts/decorators/node.js b/client/app/scripts/decorators/node.js
@@ -31,7 +31,7 @@ export function nodeActiveMetricDecorator(node) {
 
 export function nodeResourceBoxDecorator(node) {
   const widthCriterion = node.get('withCapacity') ? 'totalCapacity' : 'absoluteConsumption';
-  const width = node.getIn(['activeMetric', widthCriterion]) * 1e-4;
+  const width = node.getIn(['activeMetric', widthCriterion]);
   const height = RESOURCES_LAYER_HEIGHT;
 
   return node.merge(makeMap({ width, height }));

diff --git a/client/app/scripts/selectors/resource-view/layers.js b/client/app/scripts/selectors/resource-view/layers.js
@@ -72,8 +72,6 @@ const decoratedNodesByTopologySelector = createSelector(
         .filter(node => node.get('parentNodeId') || index === 0)
         .filter(node => node.get('width'));
 
-      // console.log('Max width', filteredTopologyNodes.map(n => n.get('width')).max());
-      // console.log('Min width', filteredTopologyNodes.map(n => n.get('width')).min());
       nodesByTopology = nodesByTopology.set(layerTopologyId, filteredTopologyNodes);
       lastLayerTopologyId = layerTopologyId;
     });