From 0a900add399c3bed74cac87055d977a0d00609b5 Mon Sep 17 00:00:00 2001
From: mbucknell <mbucknell@usgs.gov>
Date: Tue, 17 Nov 2020 15:51:40 -0600
Subject: [PATCH] Updated to relative in directory imports for
daily-value-hydrograph and lib directories
---
.../leaflet-rendering/legend-control.spec.js | 2 +-
.../src/scripts/leaflet-rendering/map.spec.js | 2 +-
assets/src/scripts/lib/d3-redux.spec.js | 2 +-
.../daily-value-hydrograph/graph-brush.js | 19 +++++++++-------
.../graph-brush.spec.js | 2 +-
.../daily-value-hydrograph/graph-controls.js | 1 +
.../graph-controls.spec.js | 4 +++-
.../daily-value-hydrograph/index.js | 16 +++++++-------
.../daily-value-hydrograph/index.spec.js | 2 +-
.../daily-value-hydrograph/legend.js | 7 +++---
.../daily-value-hydrograph/selectors/axes.js | 4 ++--
.../selectors/labels.spec.js | 2 +-
.../selectors/legend-data.js | 4 ++--
.../selectors/legend-data.spec.js | 4 ++--
.../selectors/scales.js | 2 +-
.../selectors/scales.spec.js | 2 +-
.../selectors/time-series-data.js | 2 +-
.../selectors/time-series-data.spec.js | 2 +-
.../time-series-graph.js | 22 +++++++++----------
.../time-series-graph.spec.js | 2 +-
.../daily-value-hydrograph/tooltip.js | 8 ++++---
.../daily-value-hydrograph/tooltip.spec.js | 2 +-
22 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/assets/src/scripts/leaflet-rendering/legend-control.spec.js b/assets/src/scripts/leaflet-rendering/legend-control.spec.js
index 103fd4a11..b0571ba7d 100644
--- a/assets/src/scripts/leaflet-rendering/legend-control.spec.js
+++ b/assets/src/scripts/leaflet-rendering/legend-control.spec.js
@@ -1,4 +1,4 @@
-import {legendControl} from 'ui/leaflet-rendering/legend-control';
+import {legendControl} from './legend-control';
describe('leaflet-rendering/legend-control', () => {
let mapDiv;
diff --git a/assets/src/scripts/leaflet-rendering/map.spec.js b/assets/src/scripts/leaflet-rendering/map.spec.js
index 128c1c1ac..91ee5d8e9 100644
--- a/assets/src/scripts/leaflet-rendering/map.spec.js
+++ b/assets/src/scripts/leaflet-rendering/map.spec.js
@@ -1,4 +1,4 @@
-import {createMap} from 'ui/leaflet-rendering/map';
+import {createMap} from './map';
describe('leaflet-rendering/map', () => {
diff --git a/assets/src/scripts/lib/d3-redux.spec.js b/assets/src/scripts/lib/d3-redux.spec.js
index 871bb028a..a1b855abe 100644
--- a/assets/src/scripts/lib/d3-redux.spec.js
+++ b/assets/src/scripts/lib/d3-redux.spec.js
@@ -1,6 +1,6 @@
import {createStore} from 'redux';
-import {listen} from 'ui/lib/d3-redux';
+import {listen} from './d3-redux';
describe('d3-redux', () => {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.js
index ed63c856c..14a07949d 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.js
@@ -1,19 +1,22 @@
import {brushX} from 'd3-brush';
import {createStructuredSelector} from 'reselect';
-import {appendXAxis} from 'd3render/axes';
+import config from 'ui/config';
import {link} from 'ui/lib/d3-redux';
+import {mediaQuery} from 'ui/utils';
+
+import {appendXAxis} from 'd3render/axes';
+
import {getDVGraphBrushOffset} from 'ml/selectors/daily-value-time-series-selector';
import {Actions} from 'ml/store/daily-value-time-series';
-import {getXAxis} from 'dvhydrograph/selectors/axes';
-import {getBrushLayout} from 'dvhydrograph/selectors/layout';
-import {getBrushXScale, getBrushYScale} from 'dvhydrograph/selectors/scales';
-import {getCurrentTimeSeriesSegments} from 'dvhydrograph/selectors/time-series-data';
+import {getXAxis} from './selectors/axes';
+import {getBrushLayout} from './selectors/layout';
+import {getBrushXScale, getBrushYScale} from './selectors/scales';
+import {getCurrentTimeSeriesSegments} from './selectors/time-series-data';
+
+import {drawDataSegments} from './time-series-graph';
-import {drawDataSegments} from 'dvhydrograph/time-series-graph';
-import {mediaQuery} from 'ui/utils';
-import config from 'ui/config';
/*
* Renders a brush element within container for the daily value graph
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.spec.js
index 946b18ec2..71447a2b7 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-brush.spec.js
@@ -2,7 +2,7 @@ import {select} from 'd3-selection';
import{configureStore} from 'ml/store';
-import {drawGraphBrush} from 'dvhydrograph/graph-brush';
+import {drawGraphBrush} from './graph-brush';
describe ('monitoring-location/components/daily-value-hydrograph/graph-brush module', () => {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.js
index a2fc24c85..97ba08ea3 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.js
@@ -1,5 +1,6 @@
import _ from 'lodash';
import {select} from 'd3-selection';
+
import {Actions} from 'ml/store/daily-value-time-series';
/*
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.spec.js
index 27b9525f1..8244d9752 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/graph-controls.spec.js
@@ -1,6 +1,8 @@
import {select, selectAll} from 'd3-selection';
+
import {configureStore} from 'ml/store';
-import {drawGraphControls} from 'dvhydrograph/graph-controls';
+
+import {drawGraphControls} from './graph-controls';
// Tests for the graph-controls module
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.js
index 049b036eb..a4f11de91 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.js
@@ -2,17 +2,17 @@ import {select} from 'd3-selection';
import groupBy from 'lodash/groupBy';
import includes from 'lodash/includes';
-import {getAvailableDVTimeSeries, getAllDVTimeSeries} from 'ml/selectors/daily-value-time-series-selector';
-import {Actions} from 'ml/store/daily-value-time-series';
-
import {drawErrorAlert, drawInfoAlert} from 'd3render/alerts';
import {drawLoadingIndicator} from 'd3render/loading-indicator';
-import {drawGraphBrush} from 'dvhydrograph/graph-brush';
-import {drawGraphControls} from 'dvhydrograph/graph-controls';
-import {drawTimeSeriesLegend} from 'dvhydrograph/legend';
-import {drawTimeSeriesGraph} from 'dvhydrograph/time-series-graph';
-import {drawTooltipCursorSlider} from 'dvhydrograph/tooltip';
+import {getAvailableDVTimeSeries, getAllDVTimeSeries} from 'ml/selectors/daily-value-time-series-selector';
+import {Actions} from 'ml/store/daily-value-time-series';
+
+import {drawGraphBrush} from './graph-brush';
+import {drawGraphControls} from './graph-controls';
+import {drawTimeSeriesLegend} from './legend';
+import {drawTimeSeriesGraph} from './time-series-graph';
+import {drawTooltipCursorSlider} from './tooltip';
const GROUND_WATER_LEVELS_PARM_CD = ['62610', '62611', '72019', '72020', '72150', '72226', '72227', '72228', '72229', '72230', '72231', '72232'];
const STATISTIC_CODES = {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.spec.js
index 5bb54c2fe..19220c4cd 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/index.spec.js
@@ -3,7 +3,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store';
import {Actions} from 'ml/store/daily-value-time-series';
-import {attachToNode} from 'dvhydrograph/index';
+import {attachToNode} from './index';
describe('monitoring-location/components/dailyValueHydrograph/index', () => {
const TEST_STATE = {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/legend.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/legend.js
index 3669abdd9..66dc9d59e 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/legend.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/legend.js
@@ -1,11 +1,12 @@
// functions to facilitate DV legend creation for a d3 plot
import {createStructuredSelector} from 'reselect';
-import {drawSimpleLegend} from 'd3render//legend';
import {link} from 'ui/lib/d3-redux';
-import {getMainLayout} from 'dvhydrograph/selectors/layout';
-import {getLegendMarkers} from 'dvhydrograph/selectors/legend-data';
+import {drawSimpleLegend} from 'd3render/legend';
+
+import {getMainLayout} from './selectors/layout';
+import {getLegendMarkers} from './selectors/legend-data';
/*
* Renders the legend on elem using information in the Redux store
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/axes.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/axes.js
index c08982d8c..d9cafb689 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/axes.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/axes.js
@@ -4,8 +4,8 @@ import memoize from 'fast-memoize';
import {DateTime} from 'luxon';
import {createSelector} from 'reselect';
-import {getXScale, getYScale} from 'dvhydrograph/selectors/scales';
-import {getLayout} from 'dvhydrograph/selectors/layout';
+import {getXScale, getYScale} from './scales';
+import {getLayout} from './layout';
export const getXAxis = memoize(kind =>createSelector(
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/labels.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/labels.spec.js
index bff7bc2f8..bfc39980d 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/labels.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/labels.spec.js
@@ -1,4 +1,4 @@
-import {getCurrentTimeSeriesDescription, getCurrentTimeSeriesYTitle, getCurrentTimeSeriesTitle} from 'dvhydrograph/selectors/labels';
+import {getCurrentTimeSeriesDescription, getCurrentTimeSeriesYTitle, getCurrentTimeSeriesTitle} from './labels';
describe('monitoring-location/components/daily-value-hydrograph/selectors/label module', () => {
describe('getCurrentTimeSeriesDescription', () => {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.js
index 8f0f7c8d7..023eebeda 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.js
@@ -1,8 +1,8 @@
import {createSelector} from 'reselect';
-import {defineLineMarker, defineRectangleMarker, defineTextOnlyMarker} from 'd3render//markers';
+import {defineLineMarker, defineRectangleMarker, defineTextOnlyMarker} from 'd3render/markers';
-import {getCurrentUniqueDataKinds} from 'dvhydrograph/selectors/time-series-data';
+import {getCurrentUniqueDataKinds} from './time-series-data';
const TS_LABEL = {
min: 'Minimum:',
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.spec.js
index 5725a44d5..b6353b5a3 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/legend-data.spec.js
@@ -1,6 +1,6 @@
-import {lineMarker, rectangleMarker, textOnlyMarker} from 'd3render//markers';
+import {lineMarker, rectangleMarker, textOnlyMarker} from 'd3render/markers';
-import {getLegendMarkers} from 'dvhydrograph/selectors/legend-data';
+import {getLegendMarkers} from './legend-data';
describe('monitoring-location/components/daily-value-hydrograph/legend-data', () => {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.js
index edd8c17c7..c30f30acd 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.js
@@ -9,7 +9,7 @@ import {
getCurrentDVTimeSeriesData
} from 'ml/selectors/daily-value-time-series-selector';
-import {getLayout} from 'dvhydrograph/selectors/layout';
+import {getLayout} from './layout';
/*
* Returns a selector function which returns a d3 scale for either the brush,
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.spec.js
index adbe5db43..7979a7f9a 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/scales.spec.js
@@ -1,4 +1,4 @@
-import {getMainXScale, getBrushXScale, getMainYScale} from 'dvhydrograph/selectors/scales';
+import {getMainXScale, getBrushXScale, getMainYScale} from './scales';
describe('monitoring-location/components/daily-value-hydrograph/selectors/scales', () => {
const TEST_STATE = {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.js
index dc7fff7d6..8c0b9d851 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.js
@@ -7,7 +7,7 @@ import {createSelector} from 'reselect';
import {getCurrentDVTimeSeriesData, getDVGraphCursorOffset} from 'ml/selectors/daily-value-time-series-selector';
import {getNearestTime} from 'ui/utils';
-import {getMainXScale, getMainYScale} from 'dvhydrograph/selectors/scales';
+import {getMainXScale, getMainYScale} from './scales';
const TWO_DAYS = 1000 * 60 * 60 * 24 * 2; // In milliseconds
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.spec.js
index 3ff464e21..9fecfb674 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/selectors/time-series-data.spec.js
@@ -4,7 +4,7 @@ import {
getCursorEpochTime,
getCurrentDataPointsAtCursor,
getCurrentUniqueDataKinds
-} from 'dvhydrograph/selectors/time-series-data';
+} from './time-series-data';
describe('monitoring-location/components/daily-value-hydrograph/time-series-data module', () => {
const TEST_STATE = {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.js
index cf6592bb9..b426601a7 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.js
@@ -1,18 +1,18 @@
import {line as d3Line} from 'd3-shape';
import {createStructuredSelector} from 'reselect';
-import {addSVGAccessibility} from 'd3render//accessibility';
-import {appendAxes} from 'd3render//axes';
-import {renderMaskDefs} from 'd3render//data-masks';
+import {addSVGAccessibility} from 'd3render/accessibility';
+import {appendAxes} from 'd3render/axes';
+import {renderMaskDefs} from 'd3render/data-masks';
import {link} from 'ui/lib/d3-redux';
-import {getXAxis, getYAxis} from 'dvhydrograph/selectors/axes';
-import {getCurrentTimeSeriesDescription, getCurrentTimeSeriesTitle, getCurrentTimeSeriesYTitle} from 'dvhydrograph/selectors/labels';
-import {getMainLayout} from 'dvhydrograph/selectors/layout';
-import {getMainXScale, getMainYScale} from 'dvhydrograph/selectors/scales';
-import {getCurrentTimeSeriesSegments} from 'dvhydrograph/selectors/time-series-data';
+import {getXAxis, getYAxis} from './selectors/axes';
+import {getCurrentTimeSeriesDescription, getCurrentTimeSeriesTitle, getCurrentTimeSeriesYTitle} from './selectors/labels';
+import {getMainLayout} from './selectors/layout';
+import {getMainXScale, getMainYScale} from './selectors/scales';
+import {getCurrentTimeSeriesSegments} from './selectors/time-series-data';
-import {drawTooltipFocus, drawTooltipText} from 'dvhydrograph/tooltip';
+import {drawTooltipFocus, drawTooltipText} from './tooltip';
const CIRCLE_RADIUS_SINGLE_PT = 1;
@@ -46,7 +46,7 @@ const addDefsPatterns = function(elem) {
renderMaskDefs(defs, 'dv-graph-pattern-mask', patterns);
};
-const drawLineSegment = function (group, {segment, tsKey, xScale, yScale}) {
+const drawLineSegment = function(group, {segment, tsKey, xScale, yScale}) {
let lineElem;
if (segment.points.length === 1) {
lineElem = group.append('circle')
@@ -116,7 +116,7 @@ const drawDataSegment = function(group, {segment, tsKey, xScale, yScale}) {
* @param {D3 scale} yScale
* @param {Boolean} enableClip
*/
-export const drawDataSegments = function (elem, {segments, xScale, yScale, enableClip}) {
+export const drawDataSegments = function(elem, {segments, xScale, yScale, enableClip}) {
elem.select('#daily-values-lines-group').remove();
const drawingGroup = elem.append('g')
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.spec.js
index 8f50e1797..c751588bf 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.spec.js
@@ -3,7 +3,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store';
import {Actions} from 'ml/store/daily-value-time-series';
-import {drawTimeSeriesGraph} from 'dvhydrograph/time-series-graph';
+import {drawTimeSeriesGraph} from './time-series-graph';
describe('monitoring-location/components/dailyValueHydrograph/time-series-graph', () => {
const TEST_STATE = {
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.js
index cb50b8990..0fec504b3 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.js
@@ -3,13 +3,15 @@ import {createStructuredSelector} from 'reselect';
import {drawCursorSlider} from 'd3render/cursor-slider';
import {drawFocusCircles, drawFocusOverlay, drawFocusLine} from 'd3render/graph-tooltip';
+
import {link} from 'ui/lib/d3-redux';
+
import {getDVGraphCursorOffset, getCurrentDVTimeSeriesUnitOfMeasure} from 'ml/selectors/daily-value-time-series-selector';
import {Actions} from 'ml/store/daily-value-time-series';
-import {getMainLayout} from 'dvhydrograph/selectors/layout';
-import {getMainXScale, getMainYScale} from 'dvhydrograph/selectors/scales';
-import {getCurrentCursorPoint, getCurrentDataPointsAtCursor, getCursorEpochTime} from 'dvhydrograph/selectors/time-series-data';
+import {getMainLayout} from './selectors/layout';
+import {getMainXScale, getMainYScale} from './selectors/scales';
+import {getCurrentCursorPoint, getCurrentDataPointsAtCursor, getCursorEpochTime} from './selectors/time-series-data';
const TOOLTIP_LABEL = {
min: 'Min',
diff --git a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.spec.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.spec.js
index 1c67c63ae..51dc58c08 100644
--- a/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.spec.js
+++ b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/tooltip.spec.js
@@ -2,7 +2,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store';
-import {drawTooltipFocus, drawTooltipText, drawTooltipCursorSlider} from 'dvhydrograph/tooltip';
+import {drawTooltipFocus, drawTooltipText, drawTooltipCursorSlider} from './tooltip';
describe('monitoring-location/components/daily-value-hydrograph/tooltip module', () => {
const TEST_STATE = {
--
GitLab