Move graph data model builder to utils package

- Move buildGraphData to @tektoncd/dashboard-utils for re-use
- Ensure top-level Graph and PipelineGraph components are exported
  by @tektoncd/dashboard-components
- Fix dependencies so graph-related packages are required by @tektoncd/dashboard-components
- Move getStatus to separate file to prevent import cycle

package.json

@@ -26,13 +26,10 @@
     "@formatjs/intl-pluralrules": "^1.2.1",
     "@tektoncd/dashboard-components": "file:./packages/components",
     "@tektoncd/dashboard-utils": "file:./packages/utils",
-    "@vx/network": "0.0.192",
     "carbon-components": "^10.6.1",
     "carbon-components-react": "^7.6.1",
     "classnames": "^2.2.6",
     "core-js": "^3.0.1",
-    "d3-path": "^1.0.8",
-    "elkjs": "^0.5.1",
     "es6-promise": "^4.2.6",
     "history": "^4.9.0",
     "isomorphic-fetch": "^2.2.1",

packages/components/package.json

@@ -14,9 +14,12 @@
     "@formatjs/intl-pluralrules": "^1.2.1",
     "@formatjs/intl-relativetimeformat": "^4.1.1",
     "@tektoncd/dashboard-utils": "file:../utils",
+    "@vx/network": "0.0.192",
     "ansi-to-react": "^5.0.0",
     "carbon-components": "^10.4.1",
     "carbon-components-react": "^7.4.1",
+    "d3-path": "^1.0.8",
+    "elkjs": "^0.5.1",
     "js-yaml": "^3.13.0",
     "prop-types": "^15.7.2",
     "react-window": "^1.8.5"

packages/components/src/components/Graph/Graph.js

@@ -63,7 +63,7 @@ export default class Graph extends Component {
           nodes: g.children
         });
       })
-      .catch(console.error);
+      .catch(console.error); // eslint-disable-line no-console
   };
 
   render() {

packages/components/src/components/Graph/PipelineGraph.js

@@ -12,9 +12,9 @@ limitations under the License.
 */
 /* istanbul ignore file */
 import React, { Component } from 'react';
+import { buildGraphData } from '@tektoncd/dashboard-utils';
 
 import Graph from './Graph';
-import buildGraphData from './buildGraphData';
 
 export default class PipelineGraph extends Component {
   state = {

packages/components/src/components/index.js

@@ -15,11 +15,13 @@ export { default as Breadcrumbs } from './Breadcrumbs';
 export { default as CancelButton } from './CancelButton';
 export { default as ErrorBoundary } from './ErrorBoundary';
 export { default as FormattedDate } from './FormattedDate';
+export { default as Graph } from './Graph/Graph';
 export { default as Header } from './Header';
 export { default as LabelFilter } from './LabelFilter';
 export { default as Log } from './Log';
 export { default as LogoutButton } from './LogoutButton';
 export { default as PageErrorBoundary } from './PageErrorBoundary';
+export { default as PipelineGraph } from './Graph/PipelineGraph';
 export { default as PipelineRun } from './PipelineRun';
 export { default as PipelineRuns } from './PipelineRuns';
 export { default as Rerun } from './Rerun';

packages/components/src/components/Graph/buildGraphData.js → packages/utils/src/utils/buildGraphData.js

@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 /* istanbul ignore file */
-import { getStatus } from '@tektoncd/dashboard-utils';
+import { getStatus } from './status';
 
 const defaultHeight = 26;
 const defaultCharWidth = 9;

packages/utils/src/utils/index.js

@@ -17,7 +17,9 @@ import Time16 from '@carbon/icons-react/lib/time/16';
 import CloseFilled from '@carbon/icons-react/lib/close--filled/16';
 import { Spinner } from '@tektoncd/dashboard-components';
 
+export { default as buildGraphData } from './buildGraphData';
 export { paths, urls } from './router';
+export { getStatus } from './status';
 
 export const ALL_NAMESPACES = '*';
 
@@ -110,11 +112,6 @@ export function stepsStatus(taskSteps, taskRunStepsStatus = []) {
   return steps;
 }
 
-export function getStatus(resource) {
-  const { conditions = [] } = resource.status || {};
-  return conditions.find(condition => condition.type === 'Succeeded') || {};
-}
-
 export function isRunning(reason, status) {
   return status === 'Unknown' && reason === 'Running';
 }

packages/utils/src/utils/status.js

@@ -0,0 +1,17 @@
+/*
+Copyright 2019 The Tekton Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export function getStatus(resource) {
+  const { conditions = [] } = resource.status || {};
+  return conditions.find(condition => condition.type === 'Succeeded') || {};
+}