github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Applied autofix for object-curly-newline rule.

Browse Source
This commit is contained in:
Filip Barl
2017-10-17 17:39:02 +02:00
parent d9a8afe81d
commit 2fcbdb7e16
45 changed files with 209 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/.eslintrc
View File

@@ -40,7 +40,6 @@
"jsx-a11y/click-events-have-key-events": 0,
"jsx-a11y/mouse-events-have-key-events": 0,
"object-curly-newline": 0,
"padded-blocks": 0,
"prefer-destructuring": 0,
"react/default-props-match-prop-types": 0,

8
client/app/scripts/charts/__tests__/nodes-layout-test.js
View File

@@ -134,13 +134,17 @@ describe('NodesLayout', () => {
},
layoutProps: {
nodes: fromJS({
n1: {id: 'n1', label: 'lold', labelMinor: 'lmold', rank: 'rold'},
n1: {
id: 'n1', label: 'lold', labelMinor: 'lmold', rank: 'rold'
},
}),
edges: fromJS({})
},
layoutProps2: {
nodes: fromJS({
n1: {id: 'n1', label: 'lnew', labelMinor: 'lmnew', rank: 'rnew', x: 111, y: 109},
n1: {
id: 'n1', label: 'lnew', labelMinor: 'lmnew', rank: 'rnew', x: 111, y: 109
},
}),
edges: fromJS({})
}

4
client/app/scripts/charts/edge-container.js
View File

@@ -70,7 +70,9 @@ export default class EdgeContainer extends React.PureComponent {
}
render() {
const { isAnimated, waypoints, scale, ...forwardedProps } = this.props;
const {
isAnimated, waypoints, scale, ...forwardedProps
} = this.props;
const { thickness, waypointsMap } = this.state;
if (!isAnimated) {

4
client/app/scripts/charts/edge.js
View File

@@ -14,7 +14,9 @@ class Edge extends React.Component {
}
render() {
const { id, path, highlighted, focused, thickness, source, target } = this.props;
const {
id, path, highlighted, focused, thickness, source, target
} = this.props;
const shouldRenderMarker = (focused || highlighted) && (source !== target);
const className = classNames('edge', { highlighted });

4
client/app/scripts/charts/node-container.js
View File

@@ -13,7 +13,9 @@ const transformedNode = (otherProps, { x, y, k }) => (
export default class NodeContainer extends React.PureComponent {
render() {
const { dx, dy, isAnimated, scale, ...forwardedProps } = this.props;
const {
dx, dy, isAnimated, scale, ...forwardedProps
} = this.props;
if (!isAnimated) {
// Show static node for optimized rendering

4
client/app/scripts/charts/node-shapes.js
View File

@@ -23,7 +23,9 @@ import {
import { encodeIdAttribute } from '../utils/dom-utils';
function NodeShape(shapeType, shapeElement, shapeProps, { id, highlighted, color, metric }) {
function NodeShape(shapeType, shapeElement, shapeProps, {
id, highlighted, color, metric
}) {
const { height, hasMetric, formattedValue } = getMetricValue(metric);
const className = classNames('shape', `shape-${shapeType}`, { metrics: hasMetric });
const metricStyle = { fill: getMetricColor(metric) };

6
client/app/scripts/charts/node.js
View File

@@ -103,8 +103,10 @@ class Node extends React.Component {
}
render() {
const { focused, highlighted, networks, pseudo, rank, label, transform,
exportingGraph, showingNetworks, stack, id, metric } = this.props;
const {
focused, highlighted, networks, pseudo, rank, label, transform,
exportingGraph, showingNetworks, stack, id, metric
} = this.props;
const { hovered } = this.state;
const color = getNodeColor(rank, label, pseudo);

4
client/app/scripts/charts/nodes-error.js
View File

@@ -1,7 +1,9 @@
import React from 'react';
import classnames from 'classnames';
const NodesError = ({ children, faIconClass, hidden, mainClassName = 'nodes-chart-error'}) => {
const NodesError = ({
children, faIconClass, hidden, mainClassName = 'nodes-chart-error'
}) => {
const className = classnames(mainClassName, {
hide: hidden
});

10
client/app/scripts/charts/nodes-grid.js
View File

@@ -58,7 +58,9 @@ function getColumns(nodes) {
}
function renderIdCell({ rank, label, labelMinor, pseudo }) {
function renderIdCell({
rank, label, labelMinor, pseudo
}) {
const showSubLabel = Boolean(pseudo) && labelMinor;
const title = showSubLabel ? `${label} (${labelMinor})` : label;
const iconStyle = {
@@ -101,8 +103,10 @@ class NodesGrid extends React.Component {
}
render() {
const { nodes, height, gridSortedBy, gridSortedDesc, canvasMargins,
searchNodeMatches, searchQuery } = this.props;
const {
nodes, height, gridSortedBy, gridSortedDesc, canvasMargins,
searchNodeMatches, searchQuery
} = this.props;
const cmpStyle = {
height,
marginTop: canvasMargins.top,

6
client/app/scripts/components/app.js
View File

@@ -170,9 +170,11 @@ class App extends React.Component {
}
render() {
const { isTableViewMode, isGraphViewMode, isResourceViewMode, showingDetails,
const {
isTableViewMode, isGraphViewMode, isResourceViewMode, showingDetails,
showingHelp, showingNetworkSelector, showingTroubleshootingMenu,
timeTravelTransitioning, showingTimeTravel } = this.props;
timeTravelTransitioning, showingTimeTravel
} = this.props;
const className = classNames('scope-app', { 'time-travel-open': showingTimeTravel });
const isIframe = window !== window.top;

4
client/app/scripts/components/debug-toolbar.js
View File

@@ -265,7 +265,9 @@ class DebugToolbar extends React.Component {
addInternetNode() {
setTimeout(() => {
this.asyncDispatch(receiveNodesDelta({
add: [{id: INTERNET, label: INTERNET, pseudo: true, labelMinor: 'Outgoing packets', shape: 'cloud'}]
add: [{
id: INTERNET, label: INTERNET, pseudo: true, labelMinor: 'Outgoing packets', shape: 'cloud'
}]
}));
}, 0);
}

4
client/app/scripts/components/footer.js
View File

@@ -34,7 +34,9 @@ class Footer extends React.Component {
}
render() {
const { hostname, version, versionUpdate, contrastMode } = this.props;
const {
hostname, version, versionUpdate, contrastMode
} = this.props;
const otherContrastModeTitle = contrastMode
? 'Switch to normal contrast' : 'Switch to high contrast';

4
client/app/scripts/components/help-panel.js
View File

@@ -150,7 +150,9 @@ function renderFieldsPanel(currentTopologyName, searchableFields) {
}
function HelpPanel({ currentTopologyName, searchableFields, onClickClose, canvasMargins }) {
function HelpPanel({
currentTopologyName, searchableFields, onClickClose, canvasMargins
}) {
return (
<div className="help-panel-wrapper">
<div className="help-panel" style={{marginTop: canvasMargins.top}}>

4
client/app/scripts/components/matched-text.js
View File

@@ -80,7 +80,9 @@ function truncateChunks(chunks, text, maxLength) {
*/
export default class MatchedText extends React.PureComponent {
render() {
const { match, text, truncate, maxLength } = this.props;
const {
match, text, truncate, maxLength
} = this.props;
const showFullValue = !truncate || (match && (match.start + match.length) > truncate);
const displayText = showFullValue ? text : text.slice(0, truncate);

4
client/app/scripts/components/node-details.js
View File

@@ -158,7 +158,9 @@ class NodeDetails extends React.Component {
}
renderDetails() {
const { details, nodeControlStatus, nodeMatches = makeMap(), topologyId } = this.props;
const {
details, nodeControlStatus, nodeMatches = makeMap(), topologyId
} = this.props;
const showControls = details.controls && details.controls.length > 0;
const nodeColor = getNodeColorDark(details.rank, details.label, details.pseudo);
const {error, pending} = nodeControlStatus ? nodeControlStatus.toJS() : {};

4
client/app/scripts/components/node-details/node-details-controls.js
View File

@@ -3,7 +3,9 @@ import { sortBy } from 'lodash';
import NodeDetailsControlButton from './node-details-control-button';
export default function NodeDetailsControls({controls, error, nodeId, pending}) {
export default function NodeDetailsControls({
controls, error, nodeId, pending
}) {
let spinnerClassName = 'fa fa-circle-o-notch fa-spin';
if (pending) {
spinnerClassName += ' node-details-controls-spinner';

4
client/app/scripts/components/node-details/node-details-health-link-item.js
View File

@@ -63,7 +63,9 @@ class NodeDetailsHealthLinkItem extends React.Component {
}
render() {
const { id, url, pausedAt, ...props } = this.props;
const {
id, url, pausedAt, ...props
} = this.props;
const metricColor = getMetricColor(id);
const labelColor = this.state.hovered && !props.valueEmpty && darkenColor(metricColor);

4
client/app/scripts/components/node-details/node-details-table-node-metric-link.js
View File

@@ -17,7 +17,9 @@ class NodeDetailsTableNodeMetricLink extends React.Component {
}
render() {
const { url, style, value, valueEmpty } = this.props;
const {
url, style, value, valueEmpty
} = this.props;
return (
<td

4
client/app/scripts/components/node-details/node-details-table-row.js
View File

@@ -154,7 +154,9 @@ export default class NodeDetailsTableRow extends React.Component {
}
render() {
const { node, nodeIdKey, topologyId, columns, onClick, colStyles, timestamp } = this.props;
const {
node, nodeIdKey, topologyId, columns, onClick, colStyles, timestamp
} = this.props;
const [firstColumnStyle, ...columnStyles] = colStyles;
const values = renderValues(node, columns, columnStyles, timestamp, topologyId);
const nodeId = node[nodeIdKey];

6
client/app/scripts/components/node-details/node-details-table.js
View File

@@ -202,8 +202,10 @@ class NodeDetailsTable extends React.Component {
}
render() {
const { nodeIdKey, columns, topologyId, onClickRow,
onMouseEnter, onMouseLeave, timestamp } = this.props;
const {
nodeIdKey, columns, topologyId, onClickRow,
onMouseEnter, onMouseLeave, timestamp
} = this.props;
const sortedBy = this.state.sortedBy || getDefaultSortedBy(columns, this.props.nodes);
const sortedByHeader = this.getColumnHeaders().find(h => h.id === sortedBy);

4
client/app/scripts/components/nodes-resources/node-resources-layer.js
View File

@@ -12,7 +12,9 @@ import {
class NodesResourcesLayer extends React.Component {
render() {
const { layerVerticalPosition, topologyId, transform, layoutNodes } = this.props;
const {
layerVerticalPosition, topologyId, transform, layoutNodes
} = this.props;
return (
<g className="node-resources-layer">

6
client/app/scripts/components/nodes-resources/node-resources-metric-box-info.js
View File

@@ -3,8 +3,10 @@ import React from 'react';
export default class NodeResourcesMetricBoxInfo extends React.Component {
humanizedMetricInfo() {
const { humanizedTotalCapacity, humanizedAbsoluteConsumption,
humanizedRelativeConsumption, showCapacity, format } = this.props.metricSummary.toJS();
const {
humanizedTotalCapacity, humanizedAbsoluteConsumption,
humanizedRelativeConsumption, showCapacity, format
} = this.props.metricSummary.toJS();
const showExtendedInfo = showCapacity && format !== 'percent';
return (

12
client/app/scripts/components/nodes-resources/node-resources-metric-box.js
View File

@@ -28,7 +28,9 @@ import {
// down to this component, so a lot of stuff gets rerendered/recalculated on every zoom action.
// On the other hand, this enables us to easily leave out the nodes that are not in the viewport.
const transformedDimensions = (props) => {
const { width, height, x, y } = applyTransform(props.transform, props);
const {
width, height, x, y
} = applyTransform(props.transform, props);
// Trim the beginning of the resource box just after the layer topology
// name to the left and the viewport width to the right. That enables us
@@ -79,7 +81,9 @@ class NodeResourcesMetricBox extends React.Component {
}
defaultRectProps(relativeHeight = 1) {
const { x, y, width, height } = this.state;
const {
x, y, width, height
} = this.state;
const translateY = height * (1 - relativeHeight);
return {
transform: `translate(0, ${translateY})`,
@@ -94,7 +98,9 @@ class NodeResourcesMetricBox extends React.Component {
render() {
const { x, y, width } = this.state;
const { id, selectedNodeId, label, color, metricSummary } = this.props;
const {
id, selectedNodeId, label, color, metricSummary
} = this.props;
const { showCapacity, relativeConsumption, type } = metricSummary.toJS();
const opacity = (selectedNodeId && selectedNodeId !== id) ? 0.35 : 1;

6
client/app/scripts/components/nodes.js
View File

@@ -52,8 +52,10 @@ class Nodes extends React.Component {
}
render() {
const { topologiesLoaded, nodesLoaded, topologies, currentTopology, isGraphViewMode,
isTableViewMode, isResourceViewMode } = this.props;
const {
topologiesLoaded, nodesLoaded, topologies, currentTopology, isGraphViewMode,
isTableViewMode, isResourceViewMode
} = this.props;
// TODO: Rename view mode components.
return (

4
client/app/scripts/components/plugins.js
View File

@@ -5,7 +5,9 @@ import classNames from 'classnames';
import Tooltip from './tooltip';
const Plugin = ({id, label, description, status}) => {
const Plugin = ({
id, label, description, status
}) => {
const error = status !== 'ok';
const className = classNames({ error });
const tip = (<span>Description: {description}<br />Status: {status}</span>);

10
client/app/scripts/components/search.js
View File

@@ -126,8 +126,10 @@ class Search extends React.Component {
}
render() {
const { nodes, pinnedSearches, searchFocused, searchMatchCountByTopology,
isResourceViewMode, searchQuery, topologiesLoaded, inputId = 'search' } = this.props;
const {
nodes, pinnedSearches, searchFocused, searchMatchCountByTopology,
isResourceViewMode, searchQuery, topologiesLoaded, inputId = 'search'
} = this.props;
const hidden = !topologiesLoaded || isResourceViewMode;
const disabled = this.props.isTopologyNodeCountZero && !hidden;
const matchCount = searchMatchCountByTopology
@@ -188,5 +190,7 @@ export default connect(
searchQuery: state.get('searchQuery'),
searchMatchCountByTopology: searchMatchCountByTopologySelector(state),
}),
{ blurSearch, doSearch, focusSearch, pinSearch, toggleHelp }
{
blurSearch, doSearch, focusSearch, pinSearch, toggleHelp
}
)(Search);

4
client/app/scripts/components/show-more.js
View File

@@ -12,7 +12,9 @@ export default class ShowMore extends React.PureComponent {
}
render() {
const { collection, notShown, expanded, hideNumber } = this.props;
const {
collection, notShown, expanded, hideNumber
} = this.props;
const showLimitAction = collection && (expanded || notShown > 0);
const limitActionText = !hideNumber && !expanded && notShown > 0 ? `+${notShown}` : '';
const limitActionIcon = !expanded && notShown > 0 ? 'fa fa-caret-down' : 'fa fa-caret-up';

4
client/app/scripts/components/sparkline.js
View File

@@ -75,7 +75,9 @@ export default class Sparkline extends React.Component {
const title = `Last ${Math.round((lastDate - firstDate) / 1000)} seconds, ` +
`${data.length} samples, min: ${min}, max: ${max}, mean: ${mean}`;
return {title, lastX, lastY, data};
return {
title, lastX, lastY, data
};
}
getEmptyGraphData() {

4
client/app/scripts/components/status.js
View File

@@ -6,7 +6,9 @@ import { isPausedSelector } from '../selectors/time-travel';
class Status extends React.Component {
render() {
const { errorUrl, topologiesLoaded, filteredNodeCount, topology, websocketClosed } = this.props;
const {
errorUrl, topologiesLoaded, filteredNodeCount, topology, websocketClosed
} = this.props;
let title = '';
let text = 'Trying to reconnect...';

6
client/app/scripts/components/time-control.js
View File

@@ -61,8 +61,10 @@ class TimeControl extends React.Component {
}
render() {
const { showingTimeTravel, pausedAt, timeTravelTransitioning, topologiesLoaded,
hasHistoricReports } = this.props;
const {
showingTimeTravel, pausedAt, timeTravelTransitioning, topologiesLoaded,
hasHistoricReports
} = this.props;
const isPausedNow = pausedAt && !showingTimeTravel;
const isTimeTravelling = showingTimeTravel;

18
client/app/scripts/components/zoomable-canvas.js
View File

@@ -88,7 +88,9 @@ class ZoomableCanvas extends React.Component {
handleZoomControlAction(scale) {
// Get the center of the SVG and zoom around it.
const { top, bottom, left, right } = this.svg.node().getBoundingClientRect();
const {
top, bottom, left, right
} = this.svg.node().getBoundingClientRect();
const centerOfCanvas = {
x: (left + right) / 2,
y: (top + bottom) / 2,
@@ -164,7 +166,8 @@ class ZoomableCanvas extends React.Component {
handlePan() {
let state = this.state;
// Apply the translation respecting the boundaries.
state = this.clampedTranslation({ ...state,
state = this.clampedTranslation({
...state,
translateX: this.state.translateX + d3Event.dx,
translateY: this.state.translateY + d3Event.dy,
});
@@ -185,8 +188,12 @@ class ZoomableCanvas extends React.Component {
}
clampedTranslation(state) {
const { width, height, canvasMargins, boundContent, layoutLimits } = this.props;
const { contentMinX, contentMaxX, contentMinY, contentMaxY } = layoutLimits.toJS();
const {
width, height, canvasMargins, boundContent, layoutLimits
} = this.props;
const {
contentMinX, contentMaxX, contentMinY, contentMaxY
} = layoutLimits.toJS();
if (boundContent) {
// If the content is required to be bounded in any way, the translation will
@@ -239,7 +246,8 @@ class ZoomableCanvas extends React.Component {
// translation limits). Adapted from:
// https://github.com/d3/d3-zoom/blob/807f02c7a5fe496fbd08cc3417b62905a8ce95fa/src/zoom.js#L251
const inversePosition = inverseTransform(this.state, position);
state = this.clampedTranslation({ ...state,
state = this.clampedTranslation({
...state,
translateX: position.x - (inversePosition.x * scaleX),
translateY: position.y - (inversePosition.y * scaleY),
});

12
client/app/scripts/constants/styles.js
View File

@@ -38,9 +38,15 @@ export const NODE_BASE_SIZE = 100;
export const EDGE_WAYPOINTS_CAP = 10;
export const CANVAS_MARGINS = {
[GRAPH_VIEW_MODE]: { top: 160, left: 80, right: 80, bottom: 150 },
[TABLE_VIEW_MODE]: { top: 220, left: 40, right: 40, bottom: 30 },
[RESOURCE_VIEW_MODE]: { top: 140, left: 210, right: 40, bottom: 150 },
[GRAPH_VIEW_MODE]: {
top: 160, left: 80, right: 80, bottom: 150
},
[TABLE_VIEW_MODE]: {
top: 220, left: 40, right: 40, bottom: 30
},
[RESOURCE_VIEW_MODE]: {
top: 140, left: 210, right: 40, bottom: 150
},
};
// Node details table constants

6
client/app/scripts/reducers/__tests__/root-test.js
View File

@@ -427,7 +427,8 @@ describe('RootReducer', () => {
RouteAction.state = {
topologyId: 'topo1',
selectedNodeId: null,
topologyOptions: {topo1: {option1: 'on'}}};
topologyOptions: {topo1: {option1: 'on'}}
};
let nextState = initialState;
nextState = reducer(nextState, RouteAction);
@@ -445,7 +446,8 @@ describe('RootReducer', () => {
RouteAction.state = {
topologyId: 'topo1',
selectedNodeId: null,
topologyOptions: null};
topologyOptions: null
};
let nextState = initialState;
nextState = reducer(nextState, RouteAction);
nextState = reducer(nextState, ReceiveTopologiesAction);

6
client/app/scripts/reducers/root.js
View File

@@ -560,7 +560,8 @@ export function rootReducer(state = initialState, action) {
// disregard if node is not selected anymore
if (state.hasIn(['nodeDetails', action.details.id])) {
state = state.updateIn(['nodeDetails', action.details.id], obj => ({ ...obj,
state = state.updateIn(['nodeDetails', action.details.id], obj => ({
...obj,
notFound: false,
timestamp: action.requestTimestamp,
details: action.details,
@@ -636,7 +637,8 @@ export function rootReducer(state = initialState, action) {
case ActionTypes.RECEIVE_NOT_FOUND: {
if (state.hasIn(['nodeDetails', action.nodeId])) {
state = state.updateIn(['nodeDetails', action.nodeId], obj => ({ ...obj,
state = state.updateIn(['nodeDetails', action.nodeId], obj => ({
...obj,
timestamp: action.requestTimestamp,
notFound: true,
}));

4
client/app/scripts/selectors/canvas.js
View File

@@ -11,7 +11,9 @@ export const canvasMarginsSelector = createSelector(
[
state => state.get('topologyViewMode'),
],
viewMode => CANVAS_MARGINS[viewMode] || { top: 0, left: 0, right: 0, bottom: 0 }
viewMode => CANVAS_MARGINS[viewMode] || {
top: 0, left: 0, right: 0, bottom: 0
}
);
export const canvasWidthSelector = createSelector(

4
client/app/scripts/selectors/graph-view/layout.js
View File

@@ -28,7 +28,9 @@ const translationToViewportCenterSelector = createSelector(
graphZoomStateSelector,
],
(centerX, centerY, zoomState) => {
const { scaleX, scaleY, translateX, translateY } = zoomState.toJS();
const {
scaleX, scaleY, translateX, translateY
} = zoomState.toJS();
return {
x: (-translateX + centerX) / scaleX,
y: (-translateY + centerY) / scaleY,

12
client/app/scripts/selectors/graph-view/zoom.js
View File

@@ -22,7 +22,9 @@ const graphBoundingRectangleSelector = createSelector(
const xMax = graphNodes.map(n => n.get('x') + NODE_BASE_SIZE).max();
const yMax = graphNodes.map(n => n.get('y') + NODE_BASE_SIZE).max();
return makeMap({ xMin, yMin, xMax, yMax });
return makeMap({
xMin, yMin, xMax, yMax
});
}
);
@@ -37,7 +39,9 @@ export const graphDefaultZoomSelector = createSelector(
(boundingRectangle, canvasMargins, width, height) => {
if (!boundingRectangle) return makeMap();
const { xMin, xMax, yMin, yMax } = boundingRectangle.toJS();
const {
xMin, xMax, yMin, yMax
} = boundingRectangle.toJS();
const xFactor = width / (xMax - xMin);
const yFactor = height / (yMax - yMin);
@@ -65,7 +69,9 @@ export const graphLimitsSelector = createSelector(
(boundingRectangle) => {
if (!boundingRectangle) return makeMap();
const { xMin, xMax, yMin, yMax } = boundingRectangle.toJS();
const {
xMin, xMax, yMin, yMax
} = boundingRectangle.toJS();
return makeMap({
minScale: MIN_SCALE,

12
client/app/scripts/selectors/resource-view/zoom.js
View File

@@ -32,7 +32,9 @@ const resourceNodesBoundingRectangleSelector = createSelector(
const xMax = flattenedNodes.map(n => n.get('offset') + n.get('width')).max();
const yMax = verticalPositions.toList().max() + RESOURCES_LAYER_HEIGHT;
return makeMap({ xMin, xMax, yMin, yMax });
return makeMap({
xMin, xMax, yMin, yMax
});
}
);
@@ -47,7 +49,9 @@ export const resourcesDefaultZoomSelector = createSelector(
(boundingRectangle, canvasMargins, width, height) => {
if (!boundingRectangle) return makeMap();
const { xMin, xMax, yMin, yMax } = boundingRectangle.toJS();
const {
xMin, xMax, yMin, yMax
} = boundingRectangle.toJS();
// The default scale takes all the available horizontal space and 70% of the vertical space.
const scaleX = (width / (xMax - xMin)) * 1.0;
@@ -76,7 +80,9 @@ export const resourcesLimitsSelector = createSelector(
(defaultZoom, boundingRectangle, minNodeWidth, width) => {
if (defaultZoom.isEmpty()) return makeMap();
const { xMin, xMax, yMin, yMax } = boundingRectangle.toJS();
const {
xMin, xMax, yMin, yMax
} = boundingRectangle.toJS();
return makeMap({
// Maximal zoom is such that the smallest box takes the whole canvas.

16
client/app/scripts/utils/__tests__/layouter-utils-test.js
View File

@@ -15,10 +15,18 @@ describe('LayouterUtils', () => {
c: {}
});
expect(initEdgesFromNodes(input).toJS()).toEqual({
[edge('a', 'b')]: { id: edge('a', 'b'), source: 'a', target: 'b', value: 1 },
[edge('a', 'c')]: { id: edge('a', 'c'), source: 'a', target: 'c', value: 1 },
[edge('b', 'a')]: { id: edge('b', 'a'), source: 'b', target: 'a', value: 1 },
[edge('b', 'b')]: { id: edge('b', 'b'), source: 'b', target: 'b', value: 1 },
[edge('a', 'b')]: {
id: edge('a', 'b'), source: 'a', target: 'b', value: 1
},
[edge('a', 'c')]: {
id: edge('a', 'c'), source: 'a', target: 'c', value: 1
},
[edge('b', 'a')]: {
id: edge('b', 'a'), source: 'b', target: 'a', value: 1
},
[edge('b', 'b')]: {
id: edge('b', 'b'), source: 'b', target: 'b', value: 1
},
});
});
});

12
client/app/scripts/utils/__tests__/math-utils-test.js
View File

@@ -37,9 +37,15 @@ describe('MathUtils', () => {
expect(f(fromJS({...entryA, ...entryB}))).toBe(30);
expect(f(fromJS({...entryA, ...entryC}))).toBe(40);
expect(f(fromJS({...entryB, ...entryC}))).toBe(50);
expect(f(fromJS({...entryA, ...entryB, ...entryC, ...entryD}))).toBe(30);
expect(f(fromJS({...entryA, ...entryB, ...entryC, ...entryD, ...entryE}))).toBe(1);
expect(f(fromJS({...entryA, ...entryB, ...entryC, ...entryD, ...entryF}))).toBe(0);
expect(f(fromJS({
...entryA, ...entryB, ...entryC, ...entryD
}))).toBe(30);
expect(f(fromJS({
...entryA, ...entryB, ...entryC, ...entryD, ...entryE
}))).toBe(1);
expect(f(fromJS({
...entryA, ...entryB, ...entryC, ...entryD, ...entryF
}))).toBe(0);
});
});
});

4
client/app/scripts/utils/__tests__/search-utils-test.js
View File

@@ -140,7 +140,9 @@ describe('SearchUtils', () => {
);
expect(matches.size).toBe(1);
expect(matches.getIn(['node1', 'field1'])).toBeDefined();
const {text, label, start, length} = matches.getIn(['node1', 'field1']);
const {
text, label, start, length
} = matches.getIn(['node1', 'field1']);
expect(text).toBe('samevalue');
expect(label).toBe('some label');
expect(start).toBe(0);

4
client/app/scripts/utils/layouter-utils.js
View File

@@ -26,7 +26,9 @@ export function initEdgesFromNodes(nodes) {
// The direction source->target is important since dagre takes
// directionality into account when calculating the layout.
const edgeId = constructEdgeId(source, target);
const edge = makeMap({ id: edgeId, value: 1, source, target });
const edge = makeMap({
id: edgeId, value: 1, source, target
});
edges = edges.set(edgeId, edge);
}
});

4
client/app/scripts/utils/node-shape-utils.js
View File

@@ -22,7 +22,9 @@ function curvedUnitPolygonPath(n) {
export const circleShapeProps = { r: 1 };
export const triangleShapeProps = { d: curvedUnitPolygonPath(3) };
export const squareShapeProps = { width: 1.8, height: 1.8, rx: 0.4, ry: 0.4, x: -0.9, y: -0.9 };
export const squareShapeProps = {
width: 1.8, height: 1.8, rx: 0.4, ry: 0.4, x: -0.9, y: -0.9
};
export const pentagonShapeProps = { d: curvedUnitPolygonPath(5) };
export const hexagonShapeProps = { d: curvedUnitPolygonPath(6) };
export const heptagonShapeProps = { d: curvedUnitPolygonPath(7) };

8
client/app/scripts/utils/search-utils.js
View File

@@ -74,7 +74,9 @@ function findNodeMatch(nodeMatches, keyPath, text, query, prefix, label, truncat
const index = text.search(queryRe);
nodeMatches = nodeMatches.setIn(
keyPath,
{text, label, start: index, length: firstMatch.length, truncate}
{
text, label, start: index, length: firstMatch.length, truncate
}
);
}
}
@@ -121,7 +123,9 @@ function findNodeMatchMetric(nodeMatches, keyPath, fieldValue, fieldLabel, metri
return nodeMatches;
}
export function searchNode(node, { prefix, query, metric, comp, value }) {
export function searchNode(node, {
prefix, query, metric, comp, value
}) {
let nodeMatches = makeMap();
if (query) {

12
client/app/scripts/utils/transform-utils.js
View File

@@ -4,7 +4,9 @@ const applyTranslateY = ({ scaleY = 1, translateY = 0 }, y) => (y * scaleY) + tr
const applyScaleX = ({ scaleX = 1 }, width) => width * scaleX;
const applyScaleY = ({ scaleY = 1 }, height) => height * scaleY;
export const applyTransform = (transform, { width = 0, height = 0, x, y }) => ({
export const applyTransform = (transform, {
width = 0, height = 0, x, y
}) => ({
x: applyTranslateX(transform, x),
y: applyTranslateY(transform, y),
width: applyScaleX(transform, width),
@@ -17,7 +19,9 @@ const inverseTranslateY = ({ scaleY = 1, translateY = 0 }, y) => (y - translateY
const inverseScaleX = ({ scaleX = 1 }, width) => width / scaleX;
const inverseScaleY = ({ scaleY = 1 }, height) => height / scaleY;
export const inverseTransform = (transform, { width = 0, height = 0, x, y }) => ({
export const inverseTransform = (transform, {
width = 0, height = 0, x, y
}) => ({
x: inverseTranslateX(transform, x),
y: inverseTranslateY(transform, y),
width: inverseScaleX(transform, width),
@@ -25,6 +29,8 @@ export const inverseTransform = (transform, { width = 0, height = 0, x, y }) =>
});
export const transformToString = ({ translateX = 0, translateY = 0, scaleX = 1, scaleY = 1 }) => (
export const transformToString = ({
translateX = 0, translateY = 0, scaleX = 1, scaleY = 1
}) => (
`translate(${translateX},${translateY}) scale(${scaleX},${scaleY})`
);