fixing conflicts

assets/src/scripts/monitoring-location/components/hydrograph/index.js

@@ -11,8 +11,6 @@ import config from 'ui/config.js';
 
 import {link} from 'ui/lib/d3-redux';
 
-import {createStructuredSelector} from 'reselect';
-
 import {drawInfoAlert} from 'd3render/alerts';
 
 import {renderTimeSeriesUrlParams} from 'ml/url-params';

assets/src/scripts/monitoring-location/components/hydrograph/index.test.js

@@ -386,7 +386,7 @@ describe('monitoring-location/components/hydrograph module', () => {
 
         it('expects to create a d3redux link for the daily statistics section', () => {
             expect(linkSpy).toHaveBeenCalled();
-            expect(linkSpy.mock.lastCall.toString()).toContain('call(drawStats');
+            expect(linkSpy.mock.lastCall.toString()).toContain('drawStatsTable');
         });
     });
 
@@ -501,7 +501,7 @@ describe('monitoring-location/components/hydrograph module', () => {
         });
 
         it('expects to not create a d3redux link for the daily statistics section', () => {
-            expect(linkSpy.mock.lastCall.toString()).not.toContain('daily-stats-container');
+            expect(linkSpy.mock.lastCall.toString()).not.toContain('drawStatsTable');
         });
     });
 });

assets/src/scripts/monitoring-location/components/hydrograph/vue-components/graph-controls.test.js

@@ -25,7 +25,7 @@ describe('monitoring-location/components/hydrograph/components/graph-controls',
 
     let restoreConsole;
     let store;
-    let retrievePriorYearSpy, retrieveMedianStatisticsSpy;
+    let retrievePriorYearSpy, retrieveStatisticsSpy;
     let showDataIndicatorSpy;
     let wrapper;
 
@@ -41,7 +41,7 @@ describe('monitoring-location/components/hydrograph/components/graph-controls',
 
     beforeEach(() => {
         retrievePriorYearSpy = jest.spyOn(hydrographData, 'retrievePriorYearIVData');
-        retrieveMedianStatisticsSpy = jest.spyOn(hydrographData, 'retrieveMedianStatistics');
+        retrieveStatisticsSpy = jest.spyOn(hydrographData, 'retrieveStatistics');
         showDataIndicatorSpy = jest.spyOn(dataIndicator, 'showDataIndicators');
 
         store = configureStore({
@@ -153,9 +153,9 @@ describe('monitoring-location/components/hydrograph/components/graph-controls',
 
         expect(showDataIndicatorSpy).toHaveBeenCalledTimes(1);
         expect(showDataIndicatorSpy.mock.calls[0][0]).toBe(true);
-        expect(retrieveMedianStatisticsSpy).toHaveBeenCalledTimes(1);
-        expect(retrieveMedianStatisticsSpy.mock.calls[0][0]).toBe('12345678');
-        expect(retrieveMedianStatisticsSpy.mock.calls[0][1]).toEqual('72019');
+        expect(retrieveStatisticsSpy).toHaveBeenCalledTimes(1);
+        expect(retrieveStatisticsSpy.mock.calls[0][0]).toBe('12345678');
+        expect(retrieveStatisticsSpy.mock.calls[0][1]).toEqual('72019');
     });
 
     it('expect that unchecking the median does not fetch data and sets data indicators off', async() => {
@@ -165,6 +165,6 @@ describe('monitoring-location/components/hydrograph/components/graph-controls',
 
         expect(showDataIndicatorSpy).toHaveBeenCalledTimes(1);
         expect(showDataIndicatorSpy.mock.calls[0][0]).toBe(false);
-        expect(retrieveMedianStatisticsSpy).not.toHaveBeenCalled();
+        expect(retrieveStatisticsSpy).not.toHaveBeenCalled();
     });
 });
\ No newline at end of file

assets/src/scripts/monitoring-location/components/hydrograph/vue-components/graph-controls.vue

 <template>
   <div>
     <USWDSCheckbox
+      id="iv-compare-timeseries-checkbox"
       label="Compare to last year"
       name="graphControls"
       value="compare"
-      id="iv-compare-timeseries-checkbox"
       :is-checked="compareChecked"
       :is-checkbox-disabled="!compareEnabled"
       @toggleCheckbox="selectCompare"
     />
     <USWDSCheckbox
+      id="iv-median-timeseries-checkbox"
       label="Display median"
       name="graphControls"
       value="median"
-      id="iv-median-timeseries-checkbox"
       :is-checked="medianChecked"
       @toggleCheckbox="selectMedian"
     />
@@ -30,7 +30,7 @@ import USWDSCheckbox from 'ui/uswds-components/checkbox.vue';
 
 import {getSelectedParameterCode, getSelectedTimeSpan} from 'ml/selectors/hydrograph-state-selector';
 import {getTimeRange} from 'ml/selectors/hydrograph-data-selector';
-import {retrieveMedianStatistics, retrievePriorYearIVData} from 'ml/store/hydrograph-data';
+import {retrieveStatistics, retrievePriorYearIVData} from 'ml/store/hydrograph-data';
 import {setCompareDataVisibility, setMedianDataVisibility} from 'ml/store/hydrograph-state';
 
 import {isVisible} from '../selectors/time-series-data';
@@ -67,7 +67,7 @@ export default {
       setCompareDataVisibility,
       setMedianDataVisibility,
       retrievePriorYearIVData,
-      retrieveMedianStatistics
+      retrieveStatistics
     });
 
     const reduxStore = inject('store');
@@ -96,7 +96,7 @@ export default {
       actions.setMedianDataVisibility(checked);
       if (checked) {
         showDataIndicators(true, reduxStore);
-        actions.retrieveMedianStatistics(siteno, getSelectedParameterCode(reduxState))
+        actions.retrieveStatistics(siteno, getSelectedParameterCode(reduxState))
           .then(() => {
             showDataIndicators(false, reduxStore);
           });