From d08a8b00a952f387835b0d4cf477b74573e7806f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= <mail@sergioramos.me>
Date: Wed, 30 Aug 2017 14:02:27 +0100
Subject: [PATCH] fix(cp-frontend): handle no data in metrics loop

---
 .../cp-frontend/src/components/service/scale.js     |  4 ++--
 .../src/containers/metrics/metrics-data-hoc.js      | 13 ++++++++++---
 .../cp-frontend/src/containers/services/list.js     |  8 +++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/cp-frontend/src/components/service/scale.js b/packages/cp-frontend/src/components/service/scale.js
index 6abb8826..9abb89ee 100644
--- a/packages/cp-frontend/src/components/service/scale.js
+++ b/packages/cp-frontend/src/components/service/scale.js
@@ -12,7 +12,7 @@ import {
 const ServiceScale = ({
   service,
   handleSubmit = () => {},
-  onCancelClick = () => {},
+  onCancel = () => {},
   invalid,
   pristine
 }) => (
@@ -32,7 +32,7 @@ const ServiceScale = ({
       <FormMeta />
       <NumberInput minValue={1} />
     </FormGroup>
-    <Button secondary onClick={onCancelClick}>
+    <Button type="button" secondary onClick={onCancel}>
       Cancel
     </Button>
     <Button type="submit" disabled={pristine || invalid} secondary>
diff --git a/packages/cp-frontend/src/containers/metrics/metrics-data-hoc.js b/packages/cp-frontend/src/containers/metrics/metrics-data-hoc.js
index e89d1d16..7cc16043 100644
--- a/packages/cp-frontend/src/containers/metrics/metrics-data-hoc.js
+++ b/packages/cp-frontend/src/containers/metrics/metrics-data-hoc.js
@@ -1,7 +1,9 @@
 import React, { Component } from 'react';
 import { compose, graphql } from 'react-apollo';
-import moment from 'moment';
+import find from 'lodash.find';
 import uniqBy from 'lodash.uniqby';
+import get from 'lodash.get';
+import moment from 'moment';
 
 export const MetricNames = [
   'AVG_MEM_BYTES',
@@ -53,8 +55,13 @@ export const withServiceMetricsGql = ({
     instanceId,
     metricName
   ) => {
-    return previousResult.deploymentGroup.services
-      .find(s => s.id === serviceId)
+    const service = find(get(previousResult, 'deploymentGroup.services', []), ['id', serviceId]);
+
+    if (!service) {
+      return [];
+    }
+
+    return service
       .instances.find(i => i.id === instanceId)
       .metrics.find(m => m.name === metricName).metrics;
   };
diff --git a/packages/cp-frontend/src/containers/services/list.js b/packages/cp-frontend/src/containers/services/list.js
index b7cb9018..64cac356 100644
--- a/packages/cp-frontend/src/containers/services/list.js
+++ b/packages/cp-frontend/src/containers/services/list.js
@@ -184,7 +184,13 @@ export default compose(
         return false;
       }
 
-      const previousEnd = services
+      const _services = forceArray(services);
+
+      if (!_services.length) {
+        return false;
+      }
+
+      const previousEnd = _services
         .map(service => get(service, 'instances[0].metrics[0].end', null))
         .filter(Boolean)
         .shift();