Merge pull request #356 from cumulus-nasa/develop

Deploy
nasa · Apr 13, 2017 · 4041416 · 4041416
2 parents 2e32a32 + c7c34e0
commit 4041416
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 25 deletions.
diff --git a/app/scripts/components/app/sidebar.js b/app/scripts/components/app/sidebar.js
@@ -11,7 +11,8 @@ var Sidebar = React.createClass({
 
   propTypes: {
     currentPath: React.PropTypes.string,
-    params: React.PropTypes.object
+    params: React.PropTypes.object,
+    count: React.PropTypes.array
   },
 
   resolvePath: function (base, path) {
@@ -21,11 +22,11 @@ var Sidebar = React.createClass({
 
   renderNavSection: function (section) {
     const { base, routes } = section;
-    const { currentPath, params } = this.props;
+    const { currentPath, params, count } = this.props;
     return (
       <div key={base}>
         <ul>
-          {routes(currentPath, params).map((d, i) => {
+          {routes(currentPath, params, count).map((d, i) => {
             let path = this.resolvePath(base, d[1]);
             let className = d[2] || '';
             if (path === currentPath) {

diff --git a/app/scripts/components/granules/index.js b/app/scripts/components/granules/index.js
@@ -1,17 +1,38 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import { get } from 'object-path';
 import Sidebar from '../app/sidebar';
+import { interval, getCount } from '../../actions';
+import { updateInterval } from '../../config';
 
 var Granules = React.createClass({
   displayName: 'Granules',
 
   propTypes: {
     children: React.PropTypes.object,
     location: React.PropTypes.object,
-    params: React.PropTypes.object
+    params: React.PropTypes.object,
+    dispatch: React.PropTypes.func,
+    stats: React.PropTypes.object
+  },
+
+  componentWillMount: function () {
+    this.cancelInterval = interval(() => this.query(), updateInterval, true);
+  },
+
+  componentWillUnmount: function () {
+    if (this.cancelInterval) { this.cancelInterval(); }
+  },
+
+  query: function () {
+    this.props.dispatch(getCount({
+      type: 'granules',
+      field: 'status'
+    }));
   },
 
   render: function () {
+    const count = get(this.props.stats, 'count.data.granules.count');
     return (
       <div className='page__granules'>
         <div className='content__header'>
@@ -21,7 +42,11 @@ var Granules = React.createClass({
         </div>
         <div className='page__content'>
           <div className='row wrapper__sidebar'>
-            <Sidebar currentPath={this.props.location.pathname} params={this.props.params} />
+            <Sidebar
+              currentPath={this.props.location.pathname}
+              params={this.props.params}
+              count={count}
+            />
             <div className='page__content--shortened'>
               {this.props.children}
             </div>

diff --git a/app/scripts/components/pdr/index.js b/app/scripts/components/pdr/index.js
@@ -1,18 +1,39 @@
 'use strict';
 import React from 'react';
+import { get } from 'object-path';
 import { connect } from 'react-redux';
 import Sidebar from '../app/sidebar';
+import { interval, getCount } from '../../actions';
+import { updateInterval } from '../../config';
 
 var Pdrs = React.createClass({
   displayName: 'Pdrs',
 
   propTypes: {
     children: React.PropTypes.object,
     location: React.PropTypes.object,
-    params: React.PropTypes.object
+    params: React.PropTypes.object,
+    dispatch: React.PropTypes.func,
+    stats: React.PropTypes.object
+  },
+
+  componentWillMount: function () {
+    this.cancelInterval = interval(() => this.query(), updateInterval, true);
+  },
+
+  componentWillUnmount: function () {
+    if (this.cancelInterval) { this.cancelInterval(); }
+  },
+
+  query: function () {
+    this.props.dispatch(getCount({
+      type: 'pdrs',
+      field: 'status'
+    }));
   },
 
   render: function () {
+    const count = get(this.props.stats, 'count.data.pdrs.count');
     return (
       <div className='page__pdrs'>
         <div className='content__header'>
@@ -22,7 +43,11 @@ var Pdrs = React.createClass({
         </div>
         <div className='page__content'>
           <div className='row wrapper__sidebar'>
-            <Sidebar currentPath={this.props.location.pathname} params={this.props.params} />
+            <Sidebar
+              currentPath={this.props.location.pathname}
+              params={this.props.params}
+              count={count}
+            />
             <div className='page__content--shortened'>
               {this.props.children}
             </div>

diff --git a/app/scripts/components/providers/index.js b/app/scripts/components/providers/index.js
@@ -1,21 +1,42 @@
 'use strict';
 import React from 'react';
+import { get } from 'object-path';
 import { connect } from 'react-redux';
 import { Link } from 'react-router';
 import Sidebar from '../app/sidebar';
+import { interval, getCount } from '../../actions';
+import { updateInterval } from '../../config';
 
 var Providers = React.createClass({
   displayName: 'Providers',
 
   propTypes: {
     children: React.PropTypes.object,
     location: React.PropTypes.object,
-    params: React.PropTypes.object
+    params: React.PropTypes.object,
+    dispatch: React.PropTypes.func,
+    stats: React.PropTypes.object
+  },
+
+  componentWillMount: function () {
+    this.cancelInterval = interval(() => this.query(), updateInterval, true);
+  },
+
+  componentWillUnmount: function () {
+    if (this.cancelInterval) { this.cancelInterval(); }
+  },
+
+  query: function () {
+    this.props.dispatch(getCount({
+      type: 'providers',
+      field: 'status'
+    }));
   },
 
   render: function () {
     const { pathname } = this.props.location;
     const alreadyInAddProvider = pathname === '/providers/add';
+    const count = get(this.props.stats, 'count.data.providers.count');
     return (
       <div className='page__providers'>
         <div className='content__header'>
@@ -26,7 +47,11 @@ var Providers = React.createClass({
         </div>
         <div className='page__content'>
           <div className='row wrapper__sidebar'>
-            {alreadyInAddProvider ? null : <Sidebar currentPath={this.props.location.pathname} params={this.props.params} />}
+            {alreadyInAddProvider ? null : <Sidebar
+              currentPath={this.props.location.pathname}
+              params={this.props.params}
+              count={count}
+            />}
             <div className='page__content--shortened'>
               {this.props.children}
             </div>

diff --git a/app/scripts/paths/granules.js b/app/scripts/paths/granules.js
@@ -1,11 +1,14 @@
 'use strict';
 import { encode } from '../utils/browser';
+import tally from './tally';
+import { queryStatus } from '../utils/status';
+const processing = queryStatus.filter(d => d !== 'failed' && d !== 'completed');
 
 const granuleRoutes = [
   ['All Granules', null],
-  ['Completed', 'completed'],
-  ['Processing', 'processing'],
-  ['Failed', 'failed']
+  ['Completed', 'completed', (d) => d.key === 'completed'],
+  ['Processing', 'processing', (d) => processing.indexOf(d.key) >= 0],
+  ['Failed', 'failed', (d) => d.key === 'failed']
 ];
 
 const singleGranuleRoutes = [
@@ -19,16 +22,17 @@ const empty = [['', '']];
 const granules = {
   base: 'granules',
   heading: 'Granules',
-  routes: (currentRoute, params) => {
+  routes: (currentRoute, params, count) => {
     if (currentRoute.indexOf('granules/granule') >= 0) {
       return singleGranuleRoutes.map(d => {
-        if (!d[1] || d[1].indexOf(':granuleId') === -1) { return d; }
+        if (!d[1] || d[1].indexOf(':granuleId') === -1) return d;
         let copy = d.slice();
         copy[1] = encode(copy[1].replace(':granuleId', params.granuleId));
         return copy;
       });
     } else if (currentRoute.slice(0, 9) === '/granules') {
-      return granuleRoutes;
+      count = count || [];
+      return granuleRoutes.map(d => tally(d, count));
     } else {
       return empty;
     }

diff --git a/app/scripts/paths/pdrs.js b/app/scripts/paths/pdrs.js
@@ -1,11 +1,14 @@
 'use strict';
+import tally from './tally';
+import { pdrQueryStatus } from '../utils/status';
+const processing = pdrQueryStatus.filter(d => d !== 'failed' && d !== 'completed');
 
 const pdrRoutes = [
   ['Overview', null],
   ['All PDRs', 'all'],
-  ['Completed', 'completed'],
-  ['Active', 'active'],
-  ['Failed', 'failed']
+  ['Completed', 'completed', (d) => d.key === 'completed'],
+  ['Active', 'active', (d) => processing.indexOf(d.key) >= 0],
+  ['Failed', 'failed', (d) => d.key === 'failed']
 ];
 
 const singlePdrRoutes = [
@@ -17,13 +20,14 @@ const empty = [['', '']];
 const pdrs = {
   base: 'pdrs',
   heading: 'PDRs',
-  routes: (currentRoute) => {
+  routes: (currentRoute, params, count) => {
     if (currentRoute.indexOf('pdrs/pdr') >= 0) {
       return singlePdrRoutes;
     } else if (currentRoute.slice(0, 5) !== '/pdrs') {
       return empty;
     } else {
-      return pdrRoutes;
+      count = count || [];
+      return pdrRoutes.map(d => tally(d, count));
     }
   }
 };

diff --git a/app/scripts/paths/providers.js b/app/scripts/paths/providers.js
@@ -1,21 +1,23 @@
 'use strict';
+import tally from './tally';
 
 const providerRoutes = [
   ['Overview', null],
   ['All Providers', 'all'],
-  ['Active', 'active'],
-  ['Inactive', 'inactive'],
-  ['Failed', 'failed']
+  ['Active', 'active', (d) => d.key === 'ingesting'],
+  ['Inactive', 'inactive', (d) => d.key === 'stopped'],
+  ['Failed', 'failed', (d) => d.key === 'failed']
 ];
 
 const EMPTY = [['', '']];
 
 const providers = {
   base: 'providers',
   heading: 'Providers',
-  routes: (currentRoute) => {
+  routes: (currentRoute, params, count) => {
     if (currentRoute.startsWith('/providers')) {
-      return providerRoutes;
+      count = count || [];
+      return providerRoutes.map(d => tally(d, count));
     } else {
       return EMPTY;
     }

diff --git a/app/scripts/paths/tally.js b/app/scripts/paths/tally.js
@@ -0,0 +1,21 @@
+'use strict';
+import { get } from 'object-path';
+import { tally } from '../utils/format';
+function tallyFn (route, count) {
+  // check for a filter function
+  const filter = route[2];
+  if (typeof filter !== 'function') return route;
+
+  // filter
+  const matches = count.filter(filter);
+  if (!matches.length) return route;
+
+  // reduce
+  const value = matches.reduce((a, b) => a + get(b, 'count', 0), 0);
+
+  // clone and set the tally
+  const copy = route.slice();
+  copy[0] += ` (${tally(value)})`;
+  return copy;
+}
+export default tallyFn;
diff --git a/app/scripts/utils/status.js b/app/scripts/utils/status.js
@@ -29,3 +29,10 @@ export const pdrStatus = {
   Completed: 'completed',
   Failed: 'failed'
 };
+
+export const pdrQueryStatus = [
+  'discovered',
+  'parsed',
+  'completed',
+  'failed'
+];