From 49466a76ceceefcd82b5dd4fea2019551a422cc6 Mon Sep 17 00:00:00 2001
From: Aaron Briggs <abriggs@contractor.usgs.gov>
Date: Mon, 19 Oct 2020 10:00:26 -0500
Subject: [PATCH] fixing auto replace errors
---
assets/rollup.config.js | 7 ++-
.../daily-value-hydrograph/graph-brush.js | 18 +++----
.../daily-value-hydrograph/index.js | 18 +++----
.../daily-value-hydrograph/legend.js | 4 +-
.../time-series-graph.js | 10 ++--
.../daily-value-hydrograph/tooltip.js | 16 +++----
.../components/hydrograph/audible.js | 9 ++--
.../components/hydrograph/data-table.js | 2 +-
.../components/hydrograph/date-controls.js | 14 +++---
.../components/hydrograph/graph-controls.js | 12 ++---
.../components/hydrograph/index.js | 48 +++++++++----------
.../components/hydrograph/legend.js | 4 +-
.../hydrograph/selectors/audible-data.js | 6 +--
.../components/hydrograph/selectors/axes.js | 12 ++---
.../hydrograph/selectors/legend-data.js | 8 ++--
.../hydrograph/time-series-graph.js | 26 +++++-----
.../components/hydrograph/tooltip.js | 20 ++++----
.../instantaneous-value-time-series-data.js | 12 ++---
18 files changed, 125 insertions(+), 121 deletions(-)
diff --git a/assets/rollup.config.js b/assets/rollup.config.js
index d122c45a5..3e56bd3b5 100644
--- a/assets/rollup.config.js
+++ b/assets/rollup.config.js
@@ -25,7 +25,12 @@ const getBundleConfig = function(src, dest) {
{find: 'ivhydrograph', replacement: path.resolve(__dirname, 'src/scripts/monitoring-location/components/hydrograph')}
];
const networkEntries = [
- {find: 'network', replacement: path.resolve(__dirname, 'src/scripts/network')}
+ {find: 'network', replacement: path.resolve(__dirname, 'src/scripts/network')},
+ {find: 'ui', replacement: path.resolve(__dirname, 'src/scripts/')},
+ {find: 'ml', replacement: path.resolve(__dirname, 'src/scripts/monitoring-location')},
+ {find:'d3render', replacement: path.resolve(__dirname, 'src/scripts/d3-rendering')},
+ {find: 'dvhydrograph', replacement: path.resolve(__dirname, 'src/scripts/monitoring-location/components/daily-value-hydrograph')},
+ {find: 'ivhydrograph', replacement: path.resolve(__dirname, 'src/scripts/monitoring-location/components/hydrograph')}
];
const entries = src === 'src/scripts/monitoring-location/index.js' ? hydrographEntries : networkEntries;
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 e2a7531c9..682d04d6e 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
@@ -2,17 +2,17 @@ import {brushX} from 'd3-brush';
import {event} from 'd3-selection';
import {createStructuredSelector} from 'reselect';
-import {appendXAxis} from '../../../d3-rendering/axes';
-import {link} from '../../../lib/d3-redux';
-import {getDVGraphBrushOffset} from '../../selectors/daily-value-time-series-selector';
-import {Actions} from '../../store/daily-value-time-series';
+import {appendXAxis} from 'd3render/axes';
+import {link} from 'ui/lib/d3-redux';
+import {getDVGraphBrushOffset} from 'ml/selectors/daily-value-time-series-selector';
+import {Actions} from 'ml/store/daily-value-time-series';
-import {getXAxis} from './selectors/axes';
-import {getBrushLayout} from './selectors/layout';
-import {getBrushXScale, getBrushYScale} from './selectors/scales';
-import {getCurrentTimeSeriesSegments} from './selectors/time-series-data';
+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 {drawDataSegments} from './time-series-graph';
+import {drawDataSegments} from 'dvhydrograph/time-series-graph';
import {mediaQuery} from 'ui/utils';
import config from 'ui/config';
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 f6bd9d548..8e2134d3a 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 '../../selectors/daily-value-time-series-selector';
-import {Actions} from '../../store/daily-value-time-series';
+import {getAvailableDVTimeSeries, getAllDVTimeSeries} from 'ml/selectors/daily-value-time-series-selector';
+import {Actions} from 'ml/store/daily-value-time-series';
-import {drawErrorAlert, drawInfoAlert} from '../../../d3-rendering/alerts';
-import {drawLoadingIndicator} from '../../../d3-rendering/loading-indicator';
+import {drawErrorAlert, drawInfoAlert} from 'd3render/alerts';
+import {drawLoadingIndicator} from 'd3render/loading-indicator';
-import {drawGraphBrush} from './graph-brush';
-import {drawGraphControls} from './graph-controls';
-import {drawTimeSeriesLegend} from './legend';
-import {drawTimeSeriesGraph} from './time-series-graph';
-import {drawTooltipCursorSlider} from './tooltip';
+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';
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/legend.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/legend.js
index 42b2e4cc6..7b681ec64 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
@@ -4,8 +4,8 @@ import {createStructuredSelector} from 'reselect';
import {drawSimpleLegend} from '../../../d3-rendering/legend';
import {link} from '../../../lib/d3-redux';
-import {getMainLayout} from './selectors/layout';
-import {getLegendMarkers} from './selectors/legend-data';
+import {getMainLayout} from 'dvhydrograph/selectors/layout';
+import {getLegendMarkers} from 'dvhydrograph/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/time-series-graph.js b/assets/src/scripts/monitoring-location/components/daily-value-hydrograph/time-series-graph.js
index a8e122c96..f5444f2f5 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
@@ -6,11 +6,11 @@ import {appendAxes} from '../../../d3-rendering/axes';
import {renderMaskDefs} from '../../../d3-rendering/data-masks';
import {link} from '../../../lib/d3-redux';
-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 {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 {drawTooltipFocus, drawTooltipText} from './tooltip';
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 498b9247f..cb50b8990 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
@@ -1,15 +1,15 @@
import {DateTime} from 'luxon';
import {createStructuredSelector} from 'reselect';
-import {drawCursorSlider} from '../../../d3-rendering/cursor-slider';
-import {drawFocusCircles, drawFocusOverlay, drawFocusLine} from '../../../d3-rendering/graph-tooltip';
-import {link} from '../../../lib/d3-redux';
-import {getDVGraphCursorOffset, getCurrentDVTimeSeriesUnitOfMeasure} from '../../selectors/daily-value-time-series-selector';
-import {Actions} from '../../store/daily-value-time-series';
+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 './selectors/layout';
-import {getMainXScale, getMainYScale} from './selectors/scales';
-import {getCurrentCursorPoint, getCurrentDataPointsAtCursor, getCursorEpochTime} from './selectors/time-series-data';
+import {getMainLayout} from 'dvhydrograph/selectors/layout';
+import {getMainXScale, getMainYScale} from 'dvhydrograph/selectors/scales';
+import {getCurrentCursorPoint, getCurrentDataPointsAtCursor, getCursorEpochTime} from 'dvhydrograph/selectors/time-series-data';
const TOOLTIP_LABEL = {
min: 'Min',
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/audible.js b/assets/src/scripts/monitoring-location/components/hydrograph/audible.js
index c782c324a..fe8836cf1 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/audible.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/audible.js
@@ -8,12 +8,11 @@ import memoize from 'fast-memoize';
import {createSelector, createStructuredSelector} from 'reselect';
import config from 'ui/config';
-import {link} from '../../../lib/d3-redux';
-import {getTimeSeries} from '../../selectors/time-series-selector';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {link} from 'ui/lib/d3-redux';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {isAudiblePlaying, getAudiblePoints} from './selectors/audible-data';
-import {getMainXScale, getMainYScale} from './selectors/scales';
+import {isAudiblePlaying, getAudiblePoints} from 'ivhydrograph/selectors/audible-data';
+import {getMainXScale} from 'ivhydrograph/selectors/scales';
// Higher tones get lower volume
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/data-table.js b/assets/src/scripts/monitoring-location/components/hydrograph/data-table.js
index 53f22a62f..6b45c729a 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/data-table.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/data-table.js
@@ -3,7 +3,7 @@ import List from 'list.js';
import {link} from '../../../lib/d3-redux';
-import {getCurrentPointData} from './selectors/drawing-data';
+import {getCurrentPointData} from 'ivhydrograph/selectors/drawing-data';
const COLUMN_HEADINGS = [
'Parameter',
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.js b/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.js
index 8961ef02d..d76b515dc 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.js
@@ -1,8 +1,8 @@
import {DateTime} from 'luxon';
import {createStructuredSelector} from 'reselect';
-import {link} from '../../../lib/d3-redux';
-import {drawLoadingIndicator} from '../../../d3-rendering/loading-indicator';
+import {link} from 'ui/lib/d3-redux';
+import {drawLoadingIndicator} from 'd3render/loading-indicator';
// required to make the USWDS component JS available to init after page load
import components from '../../../../../node_modules/uswds/src/js/components';
@@ -13,11 +13,11 @@ import {
getUserInputsForSelectingTimespan,
getCustomTimeRange,
getCurrentParmCd
-} from '../../selectors/time-series-selector';
-import {getIanaTimeZone} from '../../selectors/time-zone-selector';
-import {Actions as ivTimeSeriesDataActions} from '../../store/instantaneous-value-time-series-data';
-import {Actions as ivTimeSeriesStateActions} from '../../store/instantaneous-value-time-series-state';
-import {MAX_DIGITS_FOR_DAYS_FROM_TODAY} from './hydrograph-utils';
+} from 'ml/selectors/time-series-selector';
+import {getIanaTimeZone} from 'ml/selectors/time-zone-selector';
+import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data';
+import {Actions as ivTimeSeriesStateActions} from 'ml/store/instantaneous-value-time-series-state';
+import {MAX_DIGITS_FOR_DAYS_FROM_TODAY} from 'ivhydrograph/hydrograph-utils';
export const drawDateRangeControls = function(elem, store, siteno) {
const DATE_RANGE = [{
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.js b/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.js
index 88af0ebad..bf097c273 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.js
@@ -1,12 +1,12 @@
-import {link} from '../../../lib/d3-redux';
+import {link} from 'ui/lib/d3-redux';
-import {getCurrentVariableMedianStatistics} from '../../selectors/median-statistics-selector';
-import {getCurrentVariableTimeSeries} from '../../selectors/time-series-selector';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {getCurrentVariableMedianStatistics} from 'ml/selectors/median-statistics-selector';
+import {getCurrentVariableTimeSeries} from 'ml/selectors/time-series-selector';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {audibleUI} from './audible';
-import {isVisible} from './selectors/time-series-data';
+import {audibleUI} from 'ivhydrograph/audible';
+import {isVisible} from 'ivhydrograph/selectors/time-series-data';
/*
* Create the show audible toggle, last year toggle, and median toggle for the time series graph.
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/index.js b/assets/src/scripts/monitoring-location/components/hydrograph/index.js
index b658e1393..b41c98d60 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/index.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/index.js
@@ -5,32 +5,32 @@ import {select} from 'd3-selection';
import {createStructuredSelector} from 'reselect';
import config from 'ui/config.js';
-import {drawWarningAlert, drawInfoAlert} from '../../../d3-rendering/alerts';
-import {drawLoadingIndicator} from '../../../d3-rendering/loading-indicator';
-import {link} from '../../../lib/d3-redux';
+import {drawWarningAlert, drawInfoAlert} from 'd3render/alerts';
+import {drawLoadingIndicator} from 'd3render/loading-indicator';
+import {link} from 'ui/lib/d3-redux';
-import {hasAnyTimeSeries, getCurrentParmCd, getVariables} from '../../selectors/time-series-selector';
-import {Actions as ivTimeSeriesDataActions} from '../../store/instantaneous-value-time-series-data';
-import {Actions as ivTimeSeriesStateActions} from '../../store/instantaneous-value-time-series-state';
-import {Actions as statisticsDataActions} from '../../store/statistics-data';
-import {Actions as timeZoneActions} from '../../store/time-zone';
-import {Actions as floodDataActions} from '../../store/flood-inundation';
-import {renderTimeSeriesUrlParams} from '../../url-params';
+import {hasAnyTimeSeries, getCurrentParmCd, getVariables} from 'ml/selectors/time-series-selector';
+import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data';
+import {Actions as ivTimeSeriesStateActions} from 'ml/store/instantaneous-value-time-series-state';
+import {Actions as statisticsDataActions} from 'ml/store/statistics-data';
+import {Actions as timeZoneActions} from 'ml/store/time-zone';
+import {Actions as floodDataActions} from 'ml/store/flood-inundation';
+import {renderTimeSeriesUrlParams} from 'ml/url-params';
-import {drawDateRangeControls} from './date-controls';
-import {drawDataTable} from './data-table';
-import {drawGraphBrush} from './graph-brush';
-import {drawGraphControls} from './graph-controls';
-import {SPARK_LINE_DIM} from './selectors/layout';
-import {drawTimeSeriesLegend} from './legend';
-import {drawMethodPicker} from './method-picker';
-import {plotSeriesSelectTable} from './parameters';
-import {getLineSegmentsByParmCd} from './selectors/drawing-data';
-import {getAvailableParameterCodes} from './selectors/parameter-data';
-import {getTimeSeriesScalesByParmCd} from './selectors/scales';
-import {drawTimeSeriesGraph} from './time-series-graph';
-import {drawTooltipCursorSlider} from './tooltip';
-import {isPeriodWithinAcceptableRange, isPeriodCustom} from './hydrograph-utils';
+import {drawDateRangeControls} from 'ivhydrograph/date-controls';
+import {drawDataTable} from 'ivhydrograph/data-table';
+import {drawGraphBrush} from 'ivhydrograph/graph-brush';
+import {drawGraphControls} from 'ivhydrograph/graph-controls';
+import {SPARK_LINE_DIM} from 'ivhydrograph/selectors/layout';
+import {drawTimeSeriesLegend} from 'ivhydrograph/legend';
+import {drawMethodPicker} from 'ivhydrograph/method-picker';
+import {plotSeriesSelectTable} from 'ivhydrograph/parameters';
+import {getLineSegmentsByParmCd} from 'ivhydrograph/selectors/drawing-data';
+import {getAvailableParameterCodes} from 'ivhydrograph/selectors/parameter-data';
+import {getTimeSeriesScalesByParmCd} from 'ivhydrograph/selectors/scales';
+import {drawTimeSeriesGraph} from 'ivhydrograph/time-series-graph';
+import {drawTooltipCursorSlider} from 'ivhydrograph/tooltip';
+import {isPeriodWithinAcceptableRange, isPeriodCustom} from 'ivhydrograph/hydrograph-utils';
/**
* Modify styling to hide or display the elem.
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/legend.js b/assets/src/scripts/monitoring-location/components/hydrograph/legend.js
index 171847346..613e26771 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/legend.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/legend.js
@@ -3,8 +3,8 @@ import {createStructuredSelector} from 'reselect';
import {drawSimpleLegend} from '../../../d3-rendering/legend';
import {link} from '../../../lib/d3-redux';
-import {getMainLayout} from './selectors/layout';
-import {getLegendMarkerRows} from './selectors/legend-data';
+import {getMainLayout} from 'ivhydrograph/selectors/layout';
+import {getLegendMarkerRows} from 'ivhydrograph/selectors/legend-data';
export const drawTimeSeriesLegend = function(elem, store) {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/audible-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/audible-data.js
index fcb7ecf32..1a41b4197 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/audible-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/audible-data.js
@@ -6,10 +6,10 @@
import {scaleLinear} from 'd3-scale';
import {createSelector} from 'reselect';
-import {getTimeSeries} from '../../../selectors/time-series-selector';
+import {getTimeSeries} from 'ml/selectors/time-series-selector';
-import {getTsCursorPoints} from './cursor';
-import {getMainYScale} from './scales';
+import {getTsCursorPoints} from 'ivhydrograph/selectors/cursor';
+import {getMainYScale} from 'ivhydrograph/selectors/scales';
/*
* Returns a Redux selector function that returns true if the audible interface is playing.
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/axes.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/axes.js
index 9a91d3889..272cd82a6 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/axes.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/axes.js
@@ -2,14 +2,14 @@ import {axisBottom, axisLeft, axisRight} from 'd3-axis';
import memoize from 'fast-memoize';
import {createSelector} from 'reselect';
-import {generateTimeTicks} from '../../../../d3-rendering/tick-marks';
-import {getCurrentDateRange, getCurrentParmCd} from '../../../selectors/time-series-selector';
+import {generateTimeTicks} from 'd3render/tick-marks';
+import {getCurrentDateRange, getCurrentParmCd} from 'ml/selectors/time-series-selector';
import {convertCelsiusToFahrenheit, convertFahrenheitToCelsius} from 'ui/utils';
-import {getYTickDetails} from './domain';
-import {getLayout} from './layout';
-import {getXScale, getBrushXScale, getYScale, getSecondaryYScale} from './scales';
-import {getYLabel, getSecondaryYLabel, getTsTimeZone, TEMPERATURE_PARAMETERS} from './time-series-data';
+import {getYTickDetails} from 'ivhydrograph/selectors/domain';
+import {getLayout} from 'ivhydrograph/selectors/layout';
+import {getXScale, getBrushXScale, getYScale, getSecondaryYScale} from 'ivhydrograph/selectors/scales';
+import {getYLabel, getSecondaryYLabel, getTsTimeZone, TEMPERATURE_PARAMETERS} from 'ivhydrograph/selectors/time-series-data';
const createXAxis = function(xScale, ianaTimeZone) {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js
index 21532fdad..060941616 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js
@@ -2,12 +2,12 @@ import {set} from 'd3-collection';
import memoize from 'fast-memoize';
import {createSelector} from 'reselect';
-import {defineLineMarker, defineRectangleMarker, defineTextOnlyMarker} from '../../../../d3-rendering/markers';
+import {defineLineMarker, defineRectangleMarker, defineTextOnlyMarker} from 'd3render/markers';
-import {getWaterwatchFloodLevels, isWaterwatchVisible} from '../../../selectors/flood-data-selector';
-import {getCurrentVariableMedianMetadata} from '../../../selectors/median-statistics-selector';
+import {getWaterwatchFloodLevels, isWaterwatchVisible} from 'ml/selectors/flood-data-selector';
+import {getCurrentVariableMedianMetadata} from 'ml/selectors/median-statistics-selector';
-import {getCurrentVariableLineSegments, HASH_ID, MASK_DESC} from './drawing-data';
+import {getCurrentVariableLineSegments, HASH_ID, MASK_DESC} from 'ivhydrograph/selectors/drawing-data';
const TS_LABEL = {
'current': 'Current: ',
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.js b/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.js
index 4b945cb11..f0dc85019 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.js
@@ -2,26 +2,26 @@ import {line as d3Line, curveStepAfter} from 'd3-shape';
import {createStructuredSelector} from 'reselect';
import config from 'ui/config';
-import {addSVGAccessibility} from '../../../d3-rendering/accessibility';
-import {appendAxes} from '../../../d3-rendering/axes';
-import {renderMaskDefs} from '../../../d3-rendering/data-masks';
-import {link} from '../../../lib/d3-redux';
+import {addSVGAccessibility} from 'd3render/accessibility';
+import {appendAxes} from 'd3render/axes';
+import {renderMaskDefs} from 'd3render/data-masks';
+import {link} from 'ui/lib/d3-redux';
import {mediaQuery} from 'ui/utils';
-import {getAgencyCode, getMonitoringLocationName} from '../../selectors/time-series-selector';
-import {isWaterwatchVisible, getWaterwatchFloodLevels} from '../../selectors/flood-data-selector';
+import {getAgencyCode, getMonitoringLocationName} from 'ml/selectors/time-series-selector';
+import {isWaterwatchVisible, getWaterwatchFloodLevels} from 'ml/selectors/flood-data-selector';
-import {getAxes} from './selectors/axes';
+import {getAxes} from 'ivhydrograph/selectors/axes';
import {
getCurrentVariableLineSegments,
getCurrentVariableMedianStatPoints,
HASH_ID
-} from './selectors/drawing-data';
-import {getMainLayout} from './selectors/layout';
-import {getMainXScale, getMainYScale, getBrushXScale} from './selectors/scales';
-import {getDescription, isVisible, getTitle} from './selectors/time-series-data';
-import {drawDataLines} from './time-series-lines';
-import {drawTooltipFocus, drawTooltipText} from './tooltip';
+} from 'ivhydrograph/selectors/drawing-data';
+import {getMainLayout} from 'ivhydrograph/selectors/layout';
+import {getMainXScale, getMainYScale, getBrushXScale} from 'ivhydrograph/selectors/scales';
+import {getDescription, isVisible, getTitle} from 'ivhydrograph/selectors/time-series-data';
+import {drawDataLines} from 'ivhydrograph/time-series-lines';
+import {drawTooltipFocus, drawTooltipText} from 'ivhydrograph/tooltip';
const addDefsPatterns = function(elem) {
const patterns = [{
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.js b/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.js
index 1daf1e670..9c548884d 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.js
@@ -5,19 +5,19 @@ import {DateTime} from 'luxon';
import {createSelector, createStructuredSelector} from 'reselect';
import config from 'ui/config';
-import {drawCursorSlider} from '../../../d3-rendering/cursor-slider';
-import {drawFocusOverlay, drawFocusCircles, drawFocusLine} from '../../../d3-rendering/graph-tooltip';
-import {link} from '../../../lib/d3-redux';
+import {drawCursorSlider} from 'd3render/cursor-slider';
+import {drawFocusOverlay, drawFocusCircles, drawFocusLine} from 'd3render/graph-tooltip';
+import {link} from 'ui/lib/d3-redux';
import {mediaQuery, convertCelsiusToFahrenheit, convertFahrenheitToCelsius} from 'ui/utils';
-import {getCurrentParmCd} from '../../selectors/time-series-selector';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {getCurrentParmCd} from 'ml/selectors/time-series-selector';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {getCursorTime, getTsCursorPoints, getTooltipPoints} from './selectors/cursor';
-import {classesForPoint, MASK_DESC} from './selectors/drawing-data';
-import {getMainLayout} from './selectors/layout';
-import {getMainXScale, getMainYScale} from './selectors/scales';
-import {getTsTimeZone, getQualifiers, getCurrentVariableUnitCode, TEMPERATURE_PARAMETERS} from './selectors/time-series-data';
+import {getCursorTime, getTsCursorPoints, getTooltipPoints} from 'ivhydrograph/selectors/cursor';
+import {classesForPoint, MASK_DESC} from 'ivhydrograph/selectors/drawing-data';
+import {getMainLayout} from 'ivhydrograph/selectors/layout';
+import {getMainXScale, getMainYScale} from 'ivhydrograph/selectors/scales';
+import {getTsTimeZone, getQualifiers, getCurrentVariableUnitCode, TEMPERATURE_PARAMETERS} from 'ivhydrograph/selectors/time-series-data';
const getTooltipText = function(datum, qualifiers, unitCode, ianaTimeZone, currentParmCd) {
diff --git a/assets/src/scripts/monitoring-location/store/instantaneous-value-time-series-data.js b/assets/src/scripts/monitoring-location/store/instantaneous-value-time-series-data.js
index 0b064d907..251234b66 100644
--- a/assets/src/scripts/monitoring-location/store/instantaneous-value-time-series-data.js
+++ b/assets/src/scripts/monitoring-location/store/instantaneous-value-time-series-data.js
@@ -5,11 +5,11 @@ import merge from 'lodash/merge';
import omitBy from 'lodash/omitBy';
import {DateTime} from 'luxon';
-import {isPeriodCustom, parsePeriodCode} from '../components/hydrograph/hydrograph-utils';
+import {isPeriodCustom, parsePeriodCode} from 'ml/components/hydrograph/hydrograph-utils';
import {normalize} from 'ui/schema';
import {calcStartTime, sortedParameters} from 'ui/utils';
-import {getPreviousYearTimeSeries, getTimeSeries} from '../../web-services/models';
+import {getPreviousYearTimeSeries, getTimeSeries} from 'ui/web-services/models';
import {
getCurrentDateRange,
@@ -17,11 +17,11 @@ import {
getTimeSeriesCollectionIds,
getTsRequestKey,
hasTimeSeries
-} from '../selectors/time-series-selector';
-import {getIanaTimeZone} from '../selectors/time-zone-selector';
+} from 'ml/selectors/time-series-selector';
+import {getIanaTimeZone} from 'ml/selectors/time-zone-selector';
-import {Actions as floodInundationActions} from './flood-inundation';
-import {Actions as ivTimeSeriesStateActions} from './instantaneous-value-time-series-state';
+import {Actions as floodInundationActions} from 'ml/store/flood-inundation';
+import {Actions as ivTimeSeriesStateActions} from 'ml/store/instantaneous-value-time-series-state';
const GAGE_HEIGHT_CD = '00065';
--
GitLab