Updated layout and tests for new store shape

assets/src/scripts/components/hydrograph/layout.js

@@ -37,8 +37,8 @@ const SPARK_LINE_DIM = {
  * @return {Object} containing width and height properties.
  */
 const layoutSelector = createSelector(
-    (state) => state.width,
-    (state) => state.windowWidth,
+    (state) => state.ui.width,
+    (state) => state.ui.windowWidth,
     tickSelector,
     (width, windowWidth, tickDetails) => {
         const margin = mediaQuery(USWDS_SITE_MAX_WIDTH) ? MARGIN : MARGIN_SMALL_DEVICE;

assets/src/scripts/components/hydrograph/layout.spec.js

@@ -4,6 +4,7 @@ const { format } = require('d3-format');
 const { ASPECT_RATIO } = require('./layout');
 
 
+
 describe('points module', () => {
     let layoutMock = proxyquire('./layout', {
         './domain': {
@@ -18,8 +19,10 @@ describe('points module', () => {
 
     it('Should return the width and height with the predefined ASPECT_RATIO', () => {
         let layout = layoutMock.layoutSelector({
-            width: 200,
-            windowWidth: 600
+            ui: {
+                width: 200,
+                windowWidth: 600
+            }
         });
         expect(layout.width).toEqual(200);
         expect(layout.height).toEqual(200 * ASPECT_RATIO);