Merge branch 'main' of https://code.usgs.gov/wma/iow/waterdataui into wdfn-790

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Parameter codes with multiple methods will now show statistical data for each method available.
 - The hydrograph legend and time span shortcuts will now correctly display for calculated temperature parameter codes.
 - The DV graph will now have an inverted y-axis for only certain parameter codes.
+- When there is no data, title info icon will display appropriate text, rather than being blank.
 
 ## [1.2.0](https://code.usgs.gov/wma/iow/waterdataui/~/compare/waterdataui-1.1.0...waterdataui-1.2.0) - 2022-06-10
 ### Added

assets/src/scripts/d3-rendering/info-tooltip.js

@@ -12,7 +12,7 @@ import config from 'ui/config.js';
 import uswds_tooltip from 'uswds-components/usa-tooltip/src/index.js';
 
 export const appendInfoTooltip = function(elem, text, position = 'right') {
-	let tooltip = elem.append('div')
+    const tooltip = elem.append('div')
         .attr('class', 'usa-tooltip')
         .attr('data-position', position)
         .attr('title', text);
@@ -20,6 +20,6 @@ export const appendInfoTooltip = function(elem, text, position = 'right') {
         .attr('class', 'usa-icon')
         .html(`<use xlink:href="${config.STATIC_URL}img/sprite.svg#info"></use>`);
 
-    // Need to initialize USWDS tooltip explictly after page load
+    // Need to initialize USWDS tooltip explicitly after page load
     uswds_tooltip.on(elem.node());
 };

assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.js

@@ -116,25 +116,33 @@ const drawTitle = function(elem, store, siteNo, agencyCode, sitename, showMLName
     }
     titleDiv.append('div')
         .attr('class', 'primary-title')
-        .call(link(store, (elem, {title, parameter}) => {
+        .call(link(store, (elem, {title, primaryParameter}) => {
             elem.html(title);
             if (showTooltip) {
-                elem.call(appendInfoTooltip, parameter ? parameter.description : 'No description available', 'bottom');
+                elem.call(
+                    appendInfoTooltip,
+                    primaryParameter ? primaryParameter.description || 'No description available' : '',
+                    'bottom'
+                );
             }
         }, createStructuredSelector({
             title: getTitle('primary'),
-            parameter: getPrimaryParameter
+            primaryParameter: getPrimaryParameter
         })));
     titleDiv.append('div')
         .attr('class', 'secondary-title')
-        .call(link(store, (elem, {title, parameter}) => {
+        .call(link(store, (elem, {title, secondaryParameter}) => {
             elem.html(title);
-            if (showTooltip && parameter) {
-                elem.call(appendInfoTooltip, parameter ? parameter.description : 'No description available', 'bottom');
+            if (showTooltip && secondaryParameter) {
+                elem.call(
+                    appendInfoTooltip,
+                    secondaryParameter ? secondaryParameter.description || 'No description available' : '',
+                    'bottom'
+                );
             }
         }, createStructuredSelector({
             title: getTitle('secondary'),
-            parameter: getIVParameter('secondary')
+            secondaryParameter: getIVParameter('secondary')
         })));
 };
 

assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.test.js

@@ -5,7 +5,8 @@ import * as utils from 'ui/utils';
 import {configureStore} from 'ml/store';
 import {setMedianDataVisibility} from 'ml/store/hydrograph-state';
 
-import {TEST_PRIMARY_IV_DATA, TEST_GW_LEVELS, TEST_STATS_DATA,
+import {
+    TEST_PRIMARY_IV_DATA, TEST_GW_LEVELS, TEST_STATS_DATA,
     TEST_CURRENT_TIME_RANGE
 } from './mock-hydrograph-state';
 import {drawTimeSeriesGraphData, initializeTimeSeriesGraph} from './time-series-graph';
@@ -114,4 +115,32 @@ describe('monitoring-location/components/hydrograph/time-series-graph', () => {
         expect(div.selectAll('.iv-graph-gw-levels-group').html()).not.toEqual('');
         expect(div.selectAll('.median-stats-group').size()).toBe(2);
     });
+
+    it('expects the correct tooltip text when the description is available', () => {
+        initializeTimeSeriesGraph(div, store, '11112222', 'USGS', 'This site', true, true);
+
+        const titleDiv = div.select('.time-series-graph-title');
+        expect(titleDiv.select('.usa-tooltip').text()).toBe('Depth to water level, feet');
+    });
+
+    it('expects the correct tooltip text when the description is NOT available', () => {
+       const NO_PARAMETER_DATA =  {
+           parameter: {
+               parameterCode: '00065'
+           },
+           values: {}
+       };
+
+        store = configureStore({
+            ...TEST_STATE,
+            hydrographData: {
+                primaryIVData: NO_PARAMETER_DATA
+            }
+        });
+
+        initializeTimeSeriesGraph(div, store, '11112222', 'USGS', 'This site', true, true);
+
+        const titleDiv = div.select('.time-series-graph-title');
+        expect(titleDiv.select('.usa-tooltip').text()).toBe('No description available');
+    });
 });

assets/src/styles/components/hydrograph/_app.scss

@@ -153,7 +153,7 @@
     }
 
     #hydrograph-no-data-overlay {
-      color: red;
+      pointer-events: none;
       position: absolute;
       top: 0;
       left: 0;