DEV review updates, UTC correction

* graphHelpers, minor UTC correction, snapshot corrections
* dateHelpers, initial date defaults, prep for additional date functions
* helpers, index layout
* rhelGraphCard, replace default startDate, endDate props with helper

src/common/__tests__/__snapshots__/dateHelpers.test.js.snap

@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DateHelpers should have specific functions: dateHelpers 1`] = `
+Object {
+  "defaultDateTime": Object {
+    "end": null,
+    "start": null,
+  },
+}
+`;

src/common/__tests__/__snapshots__/graphHelpers.test.js.snap

@@ -72,7 +72,7 @@ Array [
 ]
 `;
 
-exports[`GraphHelpers should have specific functions: helpers 1`] = `
+exports[`GraphHelpers should have specific functions: graphHelpers 1`] = `
 Object {
   "chartDateFormat": "MMM D",
   "convertGraphData": [Function],

src/common/__tests__/dateHelpers.test.js

@@ -0,0 +1,7 @@
+import { dateHelpers } from '../dateHelpers';
+
+describe('DateHelpers', () => {
+  it('should have specific functions', () => {
+    expect(dateHelpers).toMatchSnapshot('dateHelpers');
+  });
+});

src/common/__tests__/graphHelpers.test.js

@@ -1,27 +1,32 @@
-import moment from 'moment';
-import { graphHelpers, getGraphHeight, getTooltipDimensions, getTooltipFontSize } from '../graphHelpers';
+import {
+  graphHelpers,
+  convertGraphData,
+  getGraphHeight,
+  getTooltipDimensions,
+  getTooltipFontSize
+} from '../graphHelpers';
 import { helpers } from '../helpers';
 
 describe('GraphHelpers', () => {
   const { breakpoints } = helpers;
-  const startDate = moment.utc(new Date('2019-06-01T00:00:00Z'));
-  const endDate = moment.utc(new Date('2019-06-05T00:00:00Z'));
+  const startDate = new Date('2019-06-01T00:00:00Z');
+  const endDate = new Date('2019-06-05T00:00:00Z');
   const socketLabel = 'sockets on';
   const previousLabel = 'from previous day';
 
   it('should have specific functions', () => {
-    expect(graphHelpers).toMatchSnapshot('helpers');
+    expect(graphHelpers).toMatchSnapshot('graphHelpers');
   });
 
   it('should convert graph data and return zeroed usage array if usage is empty', () => {
-    expect(
-      graphHelpers.convertGraphData({ usage: [], startDate, endDate, socketLabel, previousLabel })
-    ).toMatchSnapshot('zeroed array');
+    expect(convertGraphData({ usage: [], startDate, endDate, socketLabel, previousLabel })).toMatchSnapshot(
+      'zeroed array'
+    );
   });
 
   it('should convert graph data and generate tooltips when usage is populated', () => {
     expect(
-      graphHelpers.convertGraphData({
+      convertGraphData({
         usage: [
           { cores: 56, date: '2019-06-01T00:00:00Z', instance_count: 28 },
           { cores: 30, date: '2019-06-02T00:00:00Z', instance_count: 28 },
@@ -37,7 +42,7 @@ describe('GraphHelpers', () => {
 
   it('should convert graph data and returned zeroed array when usage throws error', () => {
     expect(
-      graphHelpers.convertGraphData({
+      convertGraphData({
         usage: [null], // unexpected usage, will throw exception
         startDate,
         endDate,

src/common/dateHelpers.js

@@ -0,0 +1,21 @@
+import moment from 'moment/moment';
+import { helpers } from './helpers';
+
+const defaultDateTime = (helpers.TEST_MODE && {
+  start: null,
+  end: null
+}) || {
+  start: moment()
+    .utc()
+    .startOf('day')
+    .subtract(30, 'days'),
+  end: moment()
+    .utc()
+    .endOf('day')
+};
+
+const dateHelpers = {
+  defaultDateTime
+};
+
+export { dateHelpers as default, dateHelpers, defaultDateTime };

src/common/graphHelpers.js

@@ -17,7 +17,7 @@ const zeroedUsageData = (startDate, endDate) => {
 
   // todo: convert "y" back towards a number if/when we handle "chartDomain.y = [0, 100]" within helpers
   for (let i = 0; i <= endDateStartDateDiff; i++) {
-    const clonedStartDate = moment(startDate);
+    const clonedStartDate = moment.utc(startDate);
     zeroedArray.push({
       x: clonedStartDate.add(i, 'days').format(chartDateFormat),
       y: '0'

src/common/index.js

@@ -0,0 +1,5 @@
+import { helpers } from './helpers';
+import { dateHelpers } from './dateHelpers';
+import { graphHelpers } from './graphHelpers';
+
+export { helpers as default, helpers, dateHelpers, graphHelpers };

src/components/rhelGraphCard/__tests__/__snapshots__/rhelGraphCard.test.js.snap

@@ -246,10 +246,6 @@ exports[`RhelGraphCard Component should render a non-connected component: non-co
 exports[`RhelGraphCard Component should render multiple states: error shows zeroed bar values 1`] = `
 Object {
   "chartBarData": Array [
-    Object {
-      "x": "May 31",
-      "y": "0",
-    },
     Object {
       "x": "Jun 1",
       "y": "0",
@@ -366,6 +362,10 @@ Object {
       "x": "Jun 29",
       "y": "0",
     },
+    Object {
+      "x": "Jun 30",
+      "y": "0",
+    },
   ],
 }
 `;
@@ -440,10 +440,6 @@ exports[`RhelGraphCard Component should render multiple states: fulfilled 1`] =
           <ChartBar
             data={
               Array [
-                Object {
-                  "x": "May 31",
-                  "y": "0",
-                },
                 Object {
                   "x": "Jun 1",
                   "y": "0",
@@ -560,6 +556,10 @@ exports[`RhelGraphCard Component should render multiple states: fulfilled 1`] =
                   "x": "Jun 29",
                   "y": "0",
                 },
+                Object {
+                  "x": "Jun 30",
+                  "y": "0",
+                },
               ]
             }
             labelComponent={

src/components/rhelGraphCard/__tests__/rhelGraphCard.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { Chart, ChartBar } from '@patternfly/react-charts';
 import { RhelGraphCard } from '../rhelGraphCard';
-import { helpers } from '../../../common/helpers';
+import { helpers } from '../../../common';
 
 describe('RhelGraphCard Component', () => {
   const { breakpoints } = helpers;

src/components/rhelGraphCard/rhelGraphCard.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withBreakpoints } from 'react-breakpoints';
-import moment from 'moment';
 import {
   Card,
   CardHead,
@@ -14,8 +13,7 @@ import {
 import { Skeleton, SkeletonSize } from '@redhat-cloud-services/frontend-components';
 import { Chart, ChartBar, ChartBaseTheme, ChartLabel, ChartStack, ChartTooltip } from '@patternfly/react-charts';
 import { connectTranslate, reduxActions } from '../../redux';
-import { helpers } from '../../common/helpers';
-import { graphHelpers } from '../../common/graphHelpers';
+import { helpers, dateHelpers, graphHelpers } from '../../common';
 import { rhelApiTypes } from '../../types/rhelApiTypes';
 
 class RhelGraphCard extends React.Component {
@@ -176,8 +174,8 @@ RhelGraphCard.defaultProps = {
   t: helpers.noopTranslate,
   breakpoints: {},
   currentBreakpoint: '',
-  startDate: moment.utc().subtract(1, 'months'),
-  endDate: moment()
+  startDate: dateHelpers.defaultDateTime.start,
+  endDate: dateHelpers.defaultDateTime.end
 };
 
 const mapStateToProps = state => ({

tests/__snapshots__/i18n.test.js.snap

@@ -5,22 +5,22 @@ exports[`i18n locale should generate a predictable pot output snapshot: pot outp
 msgstr \\"\\"
 \\"Content-Type: text/plain; charset=UTF-8\\\\n\\"
 
-#: src/components/rhelGraphCard/rhelGraphCard.js:109
+#: src/components/rhelGraphCard/rhelGraphCard.js:107
 msgctxt \\"Daily CPU socket usage\\"
 msgid \\"curiosity-graph.heading\\"
 msgstr \\"\\"
 
-#: src/components/rhelGraphCard/rhelGraphCard.js:73
+#: src/components/rhelGraphCard/rhelGraphCard.js:71
 msgctxt \\"from previous day\\"
 msgid \\"curiosity-graph.fromPrevious\\"
 msgstr \\"\\"
 
-#: src/components/rhelGraphCard/rhelGraphCard.js:79
+#: src/components/rhelGraphCard/rhelGraphCard.js:77
 msgctxt \\"Last 30 Days\\"
 msgid \\"curiosity-graph.dropdownDefault\\"
 msgstr \\"\\"
 
-#: src/components/rhelGraphCard/rhelGraphCard.js:72
+#: src/components/rhelGraphCard/rhelGraphCard.js:70
 msgctxt \\"sockets on\\"
 msgid \\"curiosity-graph.socketsOn\\"
 msgstr \\"\\"