From 88a29d94ce0d7903b7df3c0380567b1f2aaa4a4c Mon Sep 17 00:00:00 2001 From: Jade McGough Date: Tue, 20 Sep 2016 15:38:08 -0700 Subject: [PATCH] wire getSources into checkDataNodes middleware --- ui/src/CheckDataNodes.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/ui/src/CheckDataNodes.js b/ui/src/CheckDataNodes.js index c89d97a6ee..986db4d98f 100644 --- a/ui/src/CheckDataNodes.js +++ b/ui/src/CheckDataNodes.js @@ -1,6 +1,5 @@ import React, {PropTypes} from 'react'; import NoClusterError from 'shared/components/NoClusterError'; -import NoClusterLinksError from 'shared/components/NoClusterLinksError'; import {getSources} from 'src/shared/apis'; const {bool, number, string, node, func, shape} = PropTypes; @@ -31,25 +30,9 @@ const CheckDataNodes = React.createClass({ }; }, - // Data nodes are considered healthy (part of the cluster and most likely - // accepting queries) if they have a status of 'joined' and a valid http address. - getHealthyDataNodes(dataNodes) { - if (!dataNodes) { - return []; - } - - return dataNodes.filter(n => ( - n.status === 'joined' && n.httpAddr !== '' - )).map(n => { - const scheme = n.httpScheme ? n.httpScheme : 'http'; - return `${scheme}://${n.httpAddr}`; - }); - }, - componentDidMount() { getSources().then((resp) => { - // TODO: get this wired up correctly once getSources is working. - const dataNodes = this.getHealthyDataNodes(resp.data.data); + const dataNodes = resp.data.sources; this.setState({ dataNodes, isFetching: false, @@ -70,11 +53,6 @@ const CheckDataNodes = React.createClass({ return ; } - const {me} = this.context; - if (!me.cluster_links || !me.cluster_links.length) { - return ; - } - return this.props.children && React.cloneElement(this.props.children, Object.assign({}, this.props, { dataNodes, }));