From 768dde61f4d4d6d2ee688e51c1696cd206a06bfb Mon Sep 17 00:00:00 2001
From: Aaron Briggs <abriggs@contractor.usgs.gov>
Date: Mon, 19 Oct 2020 12:32:17 -0500
Subject: [PATCH] changes for iv graph
---
.../components/hydrograph/audible.spec.js | 4 ++--
.../components/hydrograph/data-table.js | 2 +-
.../components/hydrograph/data-table.spec.js | 4 ++--
.../hydrograph/date-controls.spec.js | 6 +++---
.../components/hydrograph/graph-brush.js | 20 +++++++++----------
.../components/hydrograph/graph-brush.spec.js | 4 ++--
.../hydrograph/graph-controls.spec.js | 6 +++---
.../hydrograph/hydrograph-utils.spec.js | 2 +-
.../components/hydrograph/index.spec.js | 12 +++++------
.../components/hydrograph/legend.js | 4 ++--
.../components/hydrograph/legend.spec.js | 6 +++---
.../components/hydrograph/method-picker.js | 8 ++++----
.../hydrograph/method-picker.spec.js | 4 ++--
.../components/hydrograph/parameters.js | 6 +++---
.../components/hydrograph/parameters.spec.js | 4 ++--
.../components/hydrograph/selectors/cursor.js | 8 ++++----
.../hydrograph/selectors/cursor.spec.js | 6 +++---
.../components/hydrograph/selectors/domain.js | 4 ++--
.../hydrograph/selectors/domain.spec.js | 2 +-
.../hydrograph/selectors/drawing-data.js | 6 +++---
.../hydrograph/selectors/drawing-data.spec.js | 2 +-
.../components/hydrograph/selectors/layout.js | 6 +++---
.../hydrograph/selectors/layout.spec.js | 2 +-
.../hydrograph/selectors/legend-data.spec.js | 4 ++--
.../hydrograph/selectors/parameter-data.js | 2 +-
.../selectors/parameter-data.spec.js | 2 +-
.../components/hydrograph/selectors/scales.js | 12 +++++------
.../hydrograph/selectors/scales.spec.js | 2 +-
.../hydrograph/selectors/time-series-data.js | 4 ++--
.../selectors/time-series-data.spec.js | 2 +-
.../hydrograph/time-series-graph.spec.js | 6 +++---
.../hydrograph/time-series-lines.js | 2 +-
.../components/hydrograph/tooltip.spec.js | 6 +++---
33 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/audible.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/audible.spec.js
index 7ffbd7a9c..703bb8a0d 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/audible.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/audible.spec.js
@@ -1,8 +1,8 @@
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
+import {configureStore} from 'ml/store';
-import {audibleUI} from './audible';
+import {audibleUI} from 'ivhydrograph/audible';
const TEST_STATE = {
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 6b45c729a..8e3410fc2 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/data-table.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/data-table.js
@@ -1,7 +1,7 @@
import List from 'list.js';
-import {link} from '../../../lib/d3-redux';
+import {link} from 'ui/lib/d3-redux';
import {getCurrentPointData} from 'ivhydrograph/selectors/drawing-data';
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/data-table.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/data-table.spec.js
index 7f3f99e5a..b546b0594 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/data-table.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/data-table.spec.js
@@ -1,8 +1,8 @@
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
+import {configureStore} from 'ml/store';
-import {drawDataTable} from './data-table';
+import {drawDataTable} from 'ivhydrograph/data-table';
const TEST_DATA = {
ivTimeSeriesData: {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.spec.js
index e5edfbcf0..c13b228f4 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/date-controls.spec.js
@@ -1,9 +1,9 @@
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
-import {Actions as ivTimeSeriesDataActions} from '../../store/instantaneous-value-time-series-data';
+import {configureStore} from 'ml/store';
+import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data';
-import {drawDateRangeControls} from './date-controls';
+import {drawDateRangeControls} from 'ivhydrograph/date-controls';
const TEST_STATE = {
ivTimeSeriesData: {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.js b/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.js
index 587b7d045..474a5c020 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.js
@@ -2,16 +2,16 @@ 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 {Actions} from '../../store/instantaneous-value-time-series-state';
-
-import {getBrushXAxis} from './selectors/axes';
-import {getCurrentVariableLineSegments} from './selectors/drawing-data';
-import {getBrushLayout} from './selectors/layout';
-import {getBrushXScale, getBrushYScale} from './selectors/scales';
-import {isVisible} from './selectors/time-series-data';
-import {drawDataLines} from './time-series-lines';
+import {appendXAxis} from 'd3render//axes';
+import {link} from 'ui/lib/d3-redux';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
+
+import {getBrushXAxis} from 'ivhydrograph/selectors/axes';
+import {getCurrentVariableLineSegments} from 'ivhydrograph/selectors/drawing-data';
+import {getBrushLayout} from 'ivhydrograph/selectors/layout';
+import {getBrushXScale, getBrushYScale} from 'ivhydrograph/selectors/scales';
+import {isVisible} from 'ivhydrograph/selectors/time-series-data';
+import {drawDataLines} from 'ivhydrograph/time-series-lines';
import {mediaQuery} from 'ui/utils';
import config from 'ui/config';
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.spec.js
index 779dee807..81bf98e1f 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/graph-brush.spec.js
@@ -1,8 +1,8 @@
import {select} from 'd3-selection';
-import{configureStore} from '../../store';
+import{configureStore} from 'ml/store';
-import {drawGraphBrush} from './graph-brush';
+import {drawGraphBrush} from 'ivhydrograph/graph-brush';
describe ('monitoring-location/components/hydrograph/graph-brush module', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.spec.js
index 73dd454ae..3cc506250 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/graph-controls.spec.js
@@ -1,8 +1,8 @@
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
-import {drawGraphControls} from './graph-controls';
+import {configureStore} from 'ml/store';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
+import {drawGraphControls} from 'ivhydrograph/graph-controls';
// Tests for the graph-controls module
describe('monitoring-location/components/hydrograph/graph-controls', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/hydrograph-utils.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/hydrograph-utils.spec.js
index 434319028..e74fc3dde 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/hydrograph-utils.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/hydrograph-utils.spec.js
@@ -1,4 +1,4 @@
-import {isPeriodWithinAcceptableRange, isPeriodCustom, parsePeriodCode} from './hydrograph-utils';
+import {isPeriodWithinAcceptableRange, isPeriodCustom, parsePeriodCode} from 'ivhydrograph/hydrograph-utils';
describe('isPeriodWithinAcceptableRange', () => {
it('will return correct boolean value if the url parameters for time period a within an acceptable range', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/index.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/index.spec.js
index 23239f29f..08d552a68 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/index.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/index.spec.js
@@ -1,12 +1,12 @@
import {select, selectAll} from 'd3-selection';
-import {configureStore} from '../../store';
-import {Actions as ivTimeSeriesDataActions} from '../../store/instantaneous-value-time-series-data';
-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 {configureStore} from 'ml/store';
+import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data';
+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 {attachToNode} from './index';
+import {attachToNode} from 'ivhydrograph/index';
const TEST_STATE = {
ivTimeSeriesData: {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/legend.js b/assets/src/scripts/monitoring-location/components/hydrograph/legend.js
index 613e26771..eb0157454 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/legend.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/legend.js
@@ -1,7 +1,7 @@
import {createStructuredSelector} from 'reselect';
-import {drawSimpleLegend} from '../../../d3-rendering/legend';
-import {link} from '../../../lib/d3-redux';
+import {drawSimpleLegend} from 'd3render//legend';
+import {link} from 'ui/lib/d3-redux';
import {getMainLayout} from 'ivhydrograph/selectors/layout';
import {getLegendMarkerRows} from 'ivhydrograph/selectors/legend-data';
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/legend.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/legend.spec.js
index e976e7ce2..05fea7591 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/legend.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/legend.spec.js
@@ -1,10 +1,10 @@
import {select, selectAll} from 'd3-selection';
-import {configureStore} from '../../store';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {configureStore} from 'ml/store';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {drawTimeSeriesLegend} from './legend';
+import {drawTimeSeriesLegend} from 'ivhydrograph/legend';
describe('monitoring-location/components/hydrograph/legend module', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.js b/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.js
index 6634fcd04..48f9bd47f 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.js
@@ -5,12 +5,12 @@
import {select} from 'd3-selection';
import {createStructuredSelector} from 'reselect';
-import{link} from '../../../lib/d3-redux';
+import{link} from 'ui/lib/d3-redux';
-import {getCurrentMethodID, getAllMethodsForCurrentVariable} from '../../selectors/time-series-selector';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {getCurrentMethodID, getAllMethodsForCurrentVariable} from 'ml/selectors/time-series-selector';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import { } from './selectors/time-series-data';
+import { } from 'ivhydrograph/selectors/time-series-data';
export const drawMethodPicker = function(elem, store) {
const pickerContainer = elem.insert('div', ':nth-child(2)')
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.spec.js
index f412d423a..e8524900d 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/method-picker.spec.js
@@ -1,8 +1,8 @@
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
+import {configureStore} from 'ml/store';
-import {drawMethodPicker} from './method-picker';
+import {drawMethodPicker} from 'ivhydrograph/method-picker';
describe('monitoring-location/components/hydrograph/method-picker', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js b/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js
index 7a64db665..adbbcfdc8 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/parameters.js
@@ -4,10 +4,10 @@ import {select} from 'd3-selection';
import config from 'ui/config';
import {appendTooltip} from 'ui/tooltips';
-import {Actions} from '../../store/instantaneous-value-time-series-data';
+import {Actions} from 'ml/store/instantaneous-value-time-series-data';
-import {MASK_DESC} from './selectors/drawing-data';
-import {SPARK_LINE_DIM, CIRCLE_RADIUS_SINGLE_PT} from './selectors/layout';
+import {MASK_DESC} from 'ivhydrograph/selectors/drawing-data';
+import {SPARK_LINE_DIM, CIRCLE_RADIUS_SINGLE_PT} from 'ivhydrograph/selectors/layout';
/**
* Draw a sparkline in a selected SVG element
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/parameters.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/parameters.spec.js
index 1b2e607f1..50bff0545 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/parameters.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/parameters.spec.js
@@ -1,9 +1,9 @@
import {scaleLinear} from 'd3-scale';
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
+import {configureStore} from 'ml/store';
-import {addSparkLine, plotSeriesSelectTable} from './parameters';
+import {addSparkLine, plotSeriesSelectTable} from 'ivhydrograph/parameters';
describe('monitoring-location/components/hydrograph/parameters module', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.js
index a51651b53..7931aaf50 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.js
@@ -3,11 +3,11 @@ import {createSelector} from 'reselect';
import {getNearestTime} from 'ui/utils';
-import {getCurrentMethodID} from '../../../selectors/time-series-selector';
+import {getCurrentMethodID} from 'ml/selectors/time-series-selector';
-import {getCurrentVariablePointsByTsId} from './drawing-data';
-import {getMainXScale, getMainYScale} from './scales';
-import {isVisible} from './time-series-data';
+import {getCurrentVariablePointsByTsId} from 'ivhydrograph/selectors/drawing-data';
+import {getMainXScale, getMainYScale} from 'ivhydrograph/selectors/scales';
+import {isVisible} from 'ivhydrograph/selectors/time-series-data';
export const getCursorOffset = createSelector(
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.spec.js
index 7544d7719..1889b3f35 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/cursor.spec.js
@@ -1,7 +1,7 @@
-import {configureStore} from '../../../store';
-import {Actions} from '../../../store/instantaneous-value-time-series-state';
+import {configureStore} from 'ml/store';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {getTsCursorPoints, getCursorOffset, getTooltipPoints} from './cursor';
+import {getTsCursorPoints, getCursorOffset, getTooltipPoints} from 'ivhydrograph/selectors/cursor';
let DATA = [12, 13, 14, 15, 16].map(hour => {
return {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.js
index e21765d50..950289c10 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.js
@@ -4,9 +4,9 @@ import {createSelector} from 'reselect';
import config from 'ui/config';
import {mediaQuery} from 'ui/utils';
-import {getCurrentParmCd} from '../../../selectors/time-series-selector';
+import {getCurrentParmCd} from 'ml/selectors/time-series-selector';
-import {getVisiblePoints} from './drawing-data';
+import {getVisiblePoints} from 'ivhydrograph/selectors/drawing-data';
const PADDING_RATIO = 0.2;
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.spec.js
index 623a7e83d..64130b313 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/domain.spec.js
@@ -6,7 +6,7 @@ import {
getLowestAbsoluteValueOfTickValues,
getRoundedTickValues,
generateNegativeTicks
-} from './domain';
+} from 'ivhydrograph/selectors/domain';
describe('monitoring-location/components/hydrograph/selectors/domain module', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.js
index 895e5c54a..971bc8459 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.js
@@ -10,12 +10,12 @@ import find from 'lodash/find';
import {DateTime} from 'luxon';
import {createSelector} from 'reselect';
-import {getCurrentVariableMedianStatistics} from '../../../selectors/median-statistics-selector';
+import {getCurrentVariableMedianStatistics} from 'ml/selectors/median-statistics-selector';
import {
getVariables, getCurrentMethodID, getTimeSeries, getCurrentVariableTimeSeries, getTimeSeriesForTsKey,
getTsRequestKey, getRequestTimeRange, getCurrentVariable
-} 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';
export const MASK_DESC = {
ice: 'Ice Affected',
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.spec.js
index 77452fc6d..46de3b579 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/drawing-data.spec.js
@@ -14,7 +14,7 @@ import {
getCurrentVariableMedianStatPoints,
MAX_LINE_POINT_GAP,
getCurrentPointData
-} from './drawing-data';
+} from 'ivhydrograph/selectors/drawing-data';
const TEST_DATA = {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.js
index a57f264fd..5fe68035c 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.js
@@ -7,10 +7,10 @@ import {createSelector} from 'reselect';
import config from 'ui/config';
import {mediaQuery} from 'ui/utils';
-import {getCurrentParmCd} from '../../../selectors/time-series-selector';
+import {getCurrentParmCd} from 'ml/selectors/time-series-selector';
-import {getYTickDetails} from './domain';
-import {TEMPERATURE_PARAMETERS} from './time-series-data';
+import {getYTickDetails} from 'ivhydrograph/selectors/domain';
+import {TEMPERATURE_PARAMETERS} from 'ivhydrograph/selectors/time-series-data';
export const ASPECT_RATIO = 1 / 2;
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.spec.js
index 5ec98c1b2..7b2b0f3f6 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/layout.spec.js
@@ -1,6 +1,6 @@
import {format} from 'd3-format';
-import {getMainLayout, ASPECT_RATIO} from './layout';
+import {getMainLayout, ASPECT_RATIO} from 'ivhydrograph/selectors/layout';
describe('monitoring-location/components/hydrograph/layout module', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.spec.js
index df01031e7..3a3a6f9c6 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.spec.js
@@ -1,6 +1,6 @@
-import {lineMarker, rectangleMarker, textOnlyMarker} from '../../../../d3-rendering/markers';
+import {lineMarker, rectangleMarker, textOnlyMarker} from 'd3render//markers';
-import {getLegendMarkerRows} from './legend-data';
+import {getLegendMarkerRows} from 'ivhydrograph/selectors/legend-data';
describe('monitoring-location/components/hydrograph/selectors/legend-data', () => {
const TEST_DATA = {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.js
index 1b58cbfee..b5e348d7c 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.js
@@ -2,7 +2,7 @@ import {createSelector} from 'reselect';
import {sortedParameters} from 'ui/utils';
-import {getCurrentVariableID, getTimeSeries, getVariables} from '../../../selectors/time-series-selector';
+import {getCurrentVariableID, getTimeSeries, getVariables} from 'ml/selectors/time-series-selector';
/**
* Returns a Redux selector function which returns an sorted array of metadata
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.spec.js
index 1ecc8e8e8..3300e9ee1 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/parameter-data.spec.js
@@ -1,5 +1,5 @@
-import {getAvailableParameterCodes} from './parameter-data';
+import {getAvailableParameterCodes} from 'ivhydrograph/selectors/parameter-data';
describe('monitoring-location/components/hydrograph/selectors/parameter-data', () => {
describe('getAvailableParameterCodes', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.js
index 71fd44c7d..da246d230 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.js
@@ -2,13 +2,13 @@ import {scaleLinear, scaleSymlog} from 'd3-scale';
import memoize from 'fast-memoize';
import {createSelector} from 'reselect';
-import {getVariables, getCurrentParmCd, getRequestTimeRange, getTimeSeriesForTsKey} from '../../../selectors/time-series-selector';
+import {getVariables, getCurrentParmCd, getRequestTimeRange, getTimeSeriesForTsKey} from 'ml/selectors/time-series-selector';
import {convertCelsiusToFahrenheit, convertFahrenheitToCelsius} from 'ui/utils';
-import {getYDomain, getYDomainForVisiblePoints, SYMLOG_PARMS} from './domain';
-import {getPointsByTsKey} from './drawing-data';
-import {getLayout} from './layout';
-import {TEMPERATURE_PARAMETERS} from './time-series-data';
+import {getYDomain, getYDomainForVisiblePoints, SYMLOG_PARMS} from 'ivhydrograph/selectors/domain';
+import {getPointsByTsKey} from 'ivhydrograph/selectors/drawing-data';
+import {getLayout} from 'ivhydrograph/selectors/layout';
+import {TEMPERATURE_PARAMETERS} from 'ivhydrograph/selectors/time-series-data';
const REVERSE_AXIS_PARMS = [
'72019',
@@ -30,7 +30,7 @@ const REVERSE_AXIS_PARMS = [
* @param {Number} xSize - range of scale
* @return {Object} d3 scale for time.
*/
-export const createXScale = function (timeRange, xSize) {
+export const createXScale = function(timeRange, xSize) {
// xScale is oriented on the left
let scale = scaleLinear()
.range([0, xSize]);
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.spec.js
index 71a077835..aa6d88a9f 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/scales.spec.js
@@ -1,7 +1,7 @@
import {extent} from 'd3-array';
import {DateTime} from 'luxon';
-import {createXScale, createYScale, getMainYScale, getBrushYScale, getSecondaryYScale} from './scales';
+import {createXScale, createYScale, getMainYScale, getBrushYScale, getSecondaryYScale} from 'ivhydrograph/selectors/scales';
describe('monitoring-location/components/hydrograph/scales', () => {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.js
index f57dbcd79..94bbc1547 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.js
@@ -5,8 +5,8 @@ import {createSelector} from 'reselect';
import {
getRequestTimeRange, getCurrentVariable, getCurrentParmCd, getCurrentMethodID,
getMethods
-} 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';
export const TEMPERATURE_PARAMETERS = {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.spec.js
index dd7a6d29d..edf232b2c 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/time-series-data.spec.js
@@ -1,6 +1,6 @@
import {
isVisible, getYLabel, getTitle,
- getDescription, getTsTimeZone, getSecondaryYLabel} from './time-series-data';
+ getDescription, getTsTimeZone, getSecondaryYLabel} from 'ivhydrograph/selectors/time-series-data';
const TEST_DATA = {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.spec.js
index e034cedd2..f1b52f559 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/time-series-graph.spec.js
@@ -1,9 +1,9 @@
import {select, selectAll} from 'd3-selection';
-import {configureStore} from '../../store';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {configureStore} from 'ml/store';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {drawTimeSeriesGraph} from './time-series-graph';
+import {drawTimeSeriesGraph} from 'ivhydrograph/time-series-graph';
const TEST_STATE = {
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/time-series-lines.js b/assets/src/scripts/monitoring-location/components/hydrograph/time-series-lines.js
index 2204404a1..239cc6465 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/time-series-lines.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/time-series-lines.js
@@ -1,7 +1,7 @@
import {extent} from 'd3-array';
import {line as d3Line} from 'd3-shape';
-import {HASH_ID, MASK_DESC} from './selectors/drawing-data';
+import {HASH_ID, MASK_DESC} from 'ivhydrograph/selectors/drawing-data';
const CIRCLE_RADIUS_SINGLE_PT = 1;
/*
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.spec.js b/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.spec.js
index 4c464846b..66db37028 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.spec.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/tooltip.spec.js
@@ -1,9 +1,9 @@
import {select} from 'd3-selection';
-import {configureStore} from '../../store';
-import {Actions} from '../../store/instantaneous-value-time-series-state';
+import {configureStore} from 'ml/store';
+import {Actions} from 'ml/store/instantaneous-value-time-series-state';
-import {drawTooltipText, drawTooltipFocus, drawTooltipCursorSlider} from './tooltip';
+import {drawTooltipText, drawTooltipFocus, drawTooltipCursorSlider} from 'ivhydrograph/tooltip';
describe('monitoring-location/components/hydrograph/tooltip module', () => {
--
GitLab