refactor(xod-client): unify computation of renderable pin type

xodio · Jul 31, 2018 · dd0f352 · dd0f352
1 parent 64d86c7
commit dd0f352
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/packages/xod-client/src/project/components/Pin.jsx b/packages/xod-client/src/project/components/Pin.jsx
@@ -1,10 +1,10 @@
-import R from 'ramda';
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { foldEither } from 'xod-func-tools';
 import { isGenericType, PIN_DIRECTION } from 'xod-project';
 
+import { getRenderablePinType } from '../utils';
+
 import {
   PIN_RADIUS,
   PIN_INNER_RADIUS,
@@ -52,14 +52,12 @@ const Pin = props => {
     'is-output': isOutput,
   });
 
-  const deducedType = props.deducedType
-    ? foldEither(R.always('conflicting'), R.identity, props.deducedType)
-    : null;
+  const renderableType = getRenderablePinType(props);
 
   const hasConflictingBoundValue =
-    deducedType === 'conflicting' && !props.isConnected && !!props.value;
+    renderableType === 'conflicting' && !props.isConnected && !!props.value;
 
-  const symbolClassNames = classNames('symbol', props.type, deducedType, {
+  const symbolClassNames = classNames('symbol', renderableType, {
     hasConflictingBoundValue,
     'is-connected': props.isConnected,
     'is-invalid': props.isInvalid,
@@ -99,9 +97,9 @@ const Pin = props => {
         {...pinCircleCenter}
         r={PIN_RADIUS}
       />
-      {deducedType && props.isConnected ? (
+      {props.deducedType && props.isConnected ? (
         <circle
-          className={classNames('symbol', 'is-connected', deducedType)}
+          className={classNames('symbol', 'is-connected', renderableType)}
           {...pinCircleCenter}
           r={PIN_INNER_RADIUS}
         />

diff --git a/packages/xod-client/src/project/components/nodeParts/BusNodeBody.jsx b/packages/xod-client/src/project/components/nodeParts/BusNodeBody.jsx
@@ -2,9 +2,9 @@ import * as R from 'ramda';
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { maybeProp, foldMaybe, foldEither } from 'xod-func-tools';
 import * as XP from 'xod-project';
 
+import { getRenderablePinType } from '../../utils';
 import NodeLabel from './NodeLabel';
 
 const polygonPointsGetters = {
@@ -32,14 +32,7 @@ const BusNodeBody = ({ type, size, pins, label }) => {
   };
 
   const dataType = R.compose(
-    foldMaybe(
-      XP.PIN_TYPE.T1,
-      foldEither(
-        R.always('conflicting'),
-        R.unless(XP.isBuiltInType, R.always('custom'))
-      )
-    ),
-    maybeProp('deducedType'),
+    getRenderablePinType,
     R.head, // bus nodes have exactly one pin
     R.values
   )(pins);

diff --git a/packages/xod-client/src/project/utils.js b/packages/xod-client/src/project/utils.js
@@ -1,7 +1,7 @@
 import * as R from 'ramda';
 import { Maybe } from 'ramda-fantasy';
 import * as XP from 'xod-project';
-import { foldMaybe, foldEither } from 'xod-func-tools';
+import { maybeProp, foldMaybe, foldEither } from 'xod-func-tools';
 
 import {
   getOptimalPanningOffset,
@@ -142,10 +142,12 @@ export const isNotImplementedInXodNode = R.compose(
   XP.getNodeType
 );
 
-export const getRenderablePinType = pin => {
-  const { deducedType } = pin;
-
-  return deducedType
-    ? foldEither(R.always('conflicting'), R.identity, deducedType)
-    : XP.getPinType(pin);
-};
+export const getRenderablePinType = pin =>
+  R.compose(
+    R.unless(XP.isBuiltInType, R.always('custom')),
+    foldMaybe(
+      XP.getPinType(pin),
+      foldEither(R.always('conflicting'), R.identity)
+    ),
+    maybeProp('deducedType')
+  )(pin);