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 7ffbd7a9c8f8a7caa635035709363d63148c06d0..703bb8a0d281bb57fbb54801ea217b566adc7526 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 6b45c729a3e96923cd92d1c751586649a9cfbc11..8e3410fc2fa0cfe0938e0d7247542e985357e1d6 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 7f3f99e5a71411fed9282b619eae7273b310e838..b546b059401c0779f39ade4781befe7827a7a91b 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 e5edfbcf04efa675b8b43a7418b4470e64f49b92..c13b228f4f6dc43d048ee40c59f09aa699aeae1c 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 587b7d0453000a1655d9eb7572fa6b8e6c349185..474a5c02083c8b419210aec13a414a690f6d335e 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 779dee8071e36b9a66c7e0433378860d9f564601..81bf98e1f488c643c306f3f133ea78d89696c0b8 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 73dd454ae7b6dbf66a857142bd1167420c5f598c..3cc50625079821a75d03ef873d652273c81c6fc2 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 434319028dc477b44dcc5535dac4c14075611521..e74fc3dde2442d8cddcfa97b5c3d49153a3938ca 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 23239f29f7693ae9af4251e5b006564039a929c5..08d552a686c33efcb6d75b8f6a1ca54abe5ef042 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 613e267715e0a8f8068ad931b53dcfd4b68e8fba..eb0157454f2841aea3ed943500e01d587bde71b8 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 e976e7ce22eeeb52cf8b6e7721786ed9555b30d6..05fea7591aa89c24b5b8c787cdeeda4edc56b819 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 6634fcd042463c10eff456318628fcf912d8824b..48f9bd47f64441a83bbfc0cc5e4b40cd7a7594a7 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 f412d423a8cc6d34cdcd6d70c4615095a6588482..e8524900d5d29b7aca7a604d3a993179eaa22d5b 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 7a64db665f0c9e7ccd838e1b0ba73efb2b93f9bd..adbbcfdc8fb629f66287d4e0d840626b84352789 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 1b2e607f105bcd6f6097914a631f1d5a971fc1e9..50bff0545a72c4645585ec18d8be66f115345709 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 a51651b5399b0f919a44edc010f6b592710ec3c9..7931aaf50d6edb42bac433096704626ca78ecf40 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 7544d7719f14bcf593bc4787fb5c5492156a4745..1889b3f355a07a5696b2432e523bed0d7413a0c1 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 e21765d50006b54402fc28d584f3a5f806af5ae1..950289c10aad4fbf60941ca6c6ae16682494df0a 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 623a7e83d898653fc5509d101cb33cd72d8ab52d..64130b3130e76dd449c6d0cf7b55815a7b1aac0b 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 895e5c54a94031a8158dd9e0da99b6fd8e727915..971bc8459d576b3f850e5137550ee79f3ec93678 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 77452fc6dfd76f1edffa162a52d0322d349eff2a..46de3b579bc82b9b35ac9304030fdab790f876a0 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 a57f264fd265fa3f1486f6489d0182f57696e103..5fe68035cb4cb72822c7163b2c754194ad1d7967 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 5ec98c1b21af3f04b96d316ab0b52c513559bd1d..7b2b0f3f6bb26295a2df5f47ca58e73dda36e48b 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 df01031e7c04607e8453491f7932a199ab73fdee..3a3a6f9c6026e7a12d7940e5fb29a3ba439609d6 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 1b58cbfee95c5dcb7dc0a08509f99a47ac8dea96..b5e348d7ca999d40f47855aefb2d8bcb374e37f8 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 1ecc8e8e809ee69ac17eb9b5e8c535500f39dbcf..3300e9ee1c1727ddb26d3cf315a37d5d2e3b70ee 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 71fd44c7df788fa78594a425344707d0c5e6e2cb..da246d23046345d0a44f78b1e759e0b911925051 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 71a077835a58b1a8b3f38d73814a07ed4cf35bcf..aa6d88a9f601bd6a0e4c3aad50884e5515f767e2 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 f57dbcd798b9053a3ff969968c96dc185d6f29b0..94bbc1547eef8c0d25ebb93fd69ab634d9f1288a 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 dd7a6d29d25a65d3dc433ddd3dac1495080e08bc..edf232b2cb9b749fd620960dbb8a158051327675 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 e034cedd2e99f4174559bbb405a92d25b2ed4069..f1b52f55914b8c6685e5088c08ad929200a85007 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 2204404a1d2260766875df84dd1d9cea22c7bd57..239cc64653617a2d60f0e1a403cc058a969dbcbd 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 4c464846be82f36f7c4679fcbbb890536f7f8499..66db3702842f5b0d8e8f54be59c7c8ade18d5a1b 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', () => {