Skip to content
Snippets Groups Projects
Commit cb685d67 authored by Bucknell, Mary S.'s avatar Bucknell, Mary S.
Browse files

Updated to relative imports for within directory imports for hydrograph.

parent 0a900add
No related branches found
No related tags found
No related merge requests found
Showing
with 56 additions and 48 deletions
...@@ -9,10 +9,11 @@ import {createStructuredSelector} from 'reselect'; ...@@ -9,10 +9,11 @@ import {createStructuredSelector} from 'reselect';
import config from 'ui/config'; import config from 'ui/config';
import {link} from 'ui/lib/d3-redux'; import {link} from 'ui/lib/d3-redux';
import {Actions} from 'ml/store/instantaneous-value-time-series-state'; import {Actions} from 'ml/store/instantaneous-value-time-series-state';
import {isAudiblePlaying, getAudiblePoints} from 'ivhydrograph/selectors/audible-data'; import {isAudiblePlaying, getAudiblePoints} from './selectors/audible-data';
import {getMainXScale} from 'ivhydrograph/selectors/scales'; import {getMainXScale} from './selectors/scales';
// Higher tones get lower volume // Higher tones get lower volume
......
...@@ -2,7 +2,7 @@ import {select} from 'd3-selection'; ...@@ -2,7 +2,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {audibleUI} from 'ivhydrograph/audible'; import {audibleUI} from './audible';
const TEST_STATE = { const TEST_STATE = {
......
...@@ -3,7 +3,7 @@ import List from 'list.js'; ...@@ -3,7 +3,7 @@ import List from 'list.js';
import {link} from 'ui/lib/d3-redux'; import {link} from 'ui/lib/d3-redux';
import {getCurrentPointData} from 'ivhydrograph/selectors/drawing-data'; import {getCurrentPointData} from './selectors/drawing-data';
const COLUMN_HEADINGS = [ const COLUMN_HEADINGS = [
'Parameter', 'Parameter',
......
...@@ -2,7 +2,7 @@ import {select} from 'd3-selection'; ...@@ -2,7 +2,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {drawDataTable} from 'ivhydrograph/data-table'; import {drawDataTable} from './data-table';
const TEST_DATA = { const TEST_DATA = {
ivTimeSeriesData: { ivTimeSeriesData: {
......
...@@ -17,7 +17,8 @@ import { ...@@ -17,7 +17,8 @@ import {
import {getIanaTimeZone} from 'ml/selectors/time-zone-selector'; import {getIanaTimeZone} from 'ml/selectors/time-zone-selector';
import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data'; 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 ivTimeSeriesStateActions} from 'ml/store/instantaneous-value-time-series-state';
import {MAX_DIGITS_FOR_DAYS_FROM_TODAY} from 'ivhydrograph/hydrograph-utils';
import {MAX_DIGITS_FOR_DAYS_FROM_TODAY} from './hydrograph-utils';
export const drawDateRangeControls = function(elem, store, siteno) { export const drawDateRangeControls = function(elem, store, siteno) {
const DATE_RANGE = [{ const DATE_RANGE = [{
......
...@@ -3,7 +3,7 @@ import {select} from 'd3-selection'; ...@@ -3,7 +3,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data'; import {Actions as ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data';
import {drawDateRangeControls} from 'ivhydrograph/date-controls'; import {drawDateRangeControls} from './date-controls';
const TEST_STATE = { const TEST_STATE = {
ivTimeSeriesData: { ivTimeSeriesData: {
......
import {brushX} from 'd3-brush'; import {brushX} from 'd3-brush';
import {createStructuredSelector} from 'reselect'; import {createStructuredSelector} from 'reselect';
import {appendXAxis} from 'd3render//axes'; import config from 'ui/config';
import {link} from 'ui/lib/d3-redux'; import {link} from 'ui/lib/d3-redux';
import {mediaQuery} from 'ui/utils';
import {appendXAxis} from 'd3render/axes';
import {Actions} from 'ml/store/instantaneous-value-time-series-state'; import {Actions} from 'ml/store/instantaneous-value-time-series-state';
import {getBrushXAxis} from 'ivhydrograph/selectors/axes'; import {getBrushXAxis} from './selectors/axes';
import {getCurrentVariableLineSegments} from 'ivhydrograph/selectors/drawing-data'; import {getCurrentVariableLineSegments} from './selectors/drawing-data';
import {getBrushLayout} from 'ivhydrograph/selectors/layout'; import {getBrushLayout} from './selectors/layout';
import {getBrushXScale, getBrushYScale} from 'ivhydrograph/selectors/scales'; import {getBrushXScale, getBrushYScale} from './selectors/scales';
import {isVisible} from 'ivhydrograph/selectors/time-series-data'; import {isVisible} from './selectors/time-series-data';
import {drawDataLines} from 'ivhydrograph/time-series-lines'; import {drawDataLines} from './time-series-lines';
import {mediaQuery} from 'ui/utils';
import config from 'ui/config';
/* /*
* Renders a brush element within container for the main graph * Renders a brush element within container for the main graph
......
...@@ -2,7 +2,7 @@ import {select} from 'd3-selection'; ...@@ -2,7 +2,7 @@ import {select} from 'd3-selection';
import{configureStore} from 'ml/store'; import{configureStore} from 'ml/store';
import {drawGraphBrush} from 'ivhydrograph/graph-brush'; import {drawGraphBrush} from './graph-brush';
describe ('monitoring-location/components/hydrograph/graph-brush module', () => { describe ('monitoring-location/components/hydrograph/graph-brush module', () => {
......
...@@ -5,8 +5,8 @@ import {getCurrentVariableMedianStatistics} from 'ml/selectors/median-statistics ...@@ -5,8 +5,8 @@ import {getCurrentVariableMedianStatistics} from 'ml/selectors/median-statistics
import {getCurrentVariableTimeSeries} from 'ml/selectors/time-series-selector'; import {getCurrentVariableTimeSeries} from 'ml/selectors/time-series-selector';
import {Actions} from 'ml/store/instantaneous-value-time-series-state'; import {Actions} from 'ml/store/instantaneous-value-time-series-state';
import {audibleUI} from 'ivhydrograph/audible'; import {audibleUI} from './audible';
import {isVisible} from 'ivhydrograph/selectors/time-series-data'; import {isVisible} from './selectors/time-series-data';
/* /*
* Create the show audible toggle, last year toggle, and median toggle for the time series graph. * Create the show audible toggle, last year toggle, and median toggle for the time series graph.
......
...@@ -2,7 +2,8 @@ import {select} from 'd3-selection'; ...@@ -2,7 +2,8 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {Actions} from 'ml/store/instantaneous-value-time-series-state'; import {Actions} from 'ml/store/instantaneous-value-time-series-state';
import {drawGraphControls} from 'ivhydrograph/graph-controls';
import {drawGraphControls} from './graph-controls';
// Tests for the graph-controls module // Tests for the graph-controls module
describe('monitoring-location/components/hydrograph/graph-controls', () => { describe('monitoring-location/components/hydrograph/graph-controls', () => {
......
import {isPeriodWithinAcceptableRange, isPeriodCustom, parsePeriodCode} from 'ivhydrograph/hydrograph-utils'; import {isPeriodWithinAcceptableRange, isPeriodCustom, parsePeriodCode} from './hydrograph-utils';
describe('isPeriodWithinAcceptableRange', () => { describe('isPeriodWithinAcceptableRange', () => {
it('will return correct boolean value if the url parameters for time period a within an acceptable range', () => { it('will return correct boolean value if the url parameters for time period a within an acceptable range', () => {
......
...@@ -5,9 +5,10 @@ import {select} from 'd3-selection'; ...@@ -5,9 +5,10 @@ import {select} from 'd3-selection';
import {createStructuredSelector} from 'reselect'; import {createStructuredSelector} from 'reselect';
import config from 'ui/config.js'; import config from 'ui/config.js';
import {link} from 'ui/lib/d3-redux';
import {drawWarningAlert, drawInfoAlert} from 'd3render/alerts'; import {drawWarningAlert, drawInfoAlert} from 'd3render/alerts';
import {drawLoadingIndicator} from 'd3render/loading-indicator'; import {drawLoadingIndicator} from 'd3render/loading-indicator';
import {link} from 'ui/lib/d3-redux';
import {hasAnyTimeSeries, getCurrentParmCd, getVariables} from 'ml/selectors/time-series-selector'; 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 ivTimeSeriesDataActions} from 'ml/store/instantaneous-value-time-series-data';
...@@ -17,20 +18,22 @@ import {Actions as timeZoneActions} from 'ml/store/time-zone'; ...@@ -17,20 +18,22 @@ import {Actions as timeZoneActions} from 'ml/store/time-zone';
import {Actions as floodDataActions} from 'ml/store/flood-inundation'; import {Actions as floodDataActions} from 'ml/store/flood-inundation';
import {renderTimeSeriesUrlParams} from 'ml/url-params'; import {renderTimeSeriesUrlParams} from 'ml/url-params';
import {drawDateRangeControls} from 'ivhydrograph/date-controls'; import {drawDateRangeControls} from './date-controls';
import {drawDataTable} from 'ivhydrograph/data-table'; import {drawDataTable} from './data-table';
import {drawGraphBrush} from 'ivhydrograph/graph-brush'; import {drawGraphBrush} from './graph-brush';
import {drawGraphControls} from 'ivhydrograph/graph-controls'; import {drawGraphControls} from './graph-controls';
import {SPARK_LINE_DIM} from 'ivhydrograph/selectors/layout'; import {isPeriodWithinAcceptableRange, isPeriodCustom} from './hydrograph-utils';
import {drawTimeSeriesLegend} from 'ivhydrograph/legend';
import {drawMethodPicker} from 'ivhydrograph/method-picker'; import {getLineSegmentsByParmCd} from './selectors/drawing-data';
import {plotSeriesSelectTable} from 'ivhydrograph/parameters'; import {SPARK_LINE_DIM} from './selectors/layout';
import {getLineSegmentsByParmCd} from 'ivhydrograph/selectors/drawing-data'; import {getAvailableParameterCodes} from './selectors/parameter-data';
import {getAvailableParameterCodes} from 'ivhydrograph/selectors/parameter-data'; import {getTimeSeriesScalesByParmCd} from './selectors/scales';
import {getTimeSeriesScalesByParmCd} from 'ivhydrograph/selectors/scales';
import {drawTimeSeriesGraph} from 'ivhydrograph/time-series-graph'; import {drawTimeSeriesLegend} from './legend';
import {drawTooltipCursorSlider} from 'ivhydrograph/tooltip'; import {drawMethodPicker} from './method-picker';
import {isPeriodWithinAcceptableRange, isPeriodCustom} from 'ivhydrograph/hydrograph-utils'; import {plotSeriesSelectTable} from './parameters';
import {drawTimeSeriesGraph} from './time-series-graph';
import {drawTooltipCursorSlider} from './tooltip';
/** /**
* Modify styling to hide or display the elem. * Modify styling to hide or display the elem.
......
...@@ -6,7 +6,7 @@ import {Actions as statisticsDataActions} from 'ml/store/statistics-data'; ...@@ -6,7 +6,7 @@ import {Actions as statisticsDataActions} from 'ml/store/statistics-data';
import {Actions as timeZoneActions} from 'ml/store/time-zone'; import {Actions as timeZoneActions} from 'ml/store/time-zone';
import {Actions as floodDataActions} from 'ml/store/flood-inundation'; import {Actions as floodDataActions} from 'ml/store/flood-inundation';
import {attachToNode} from 'ivhydrograph/index'; import {attachToNode} from './index';
const TEST_STATE = { const TEST_STATE = {
ivTimeSeriesData: { ivTimeSeriesData: {
......
...@@ -3,8 +3,8 @@ import {createStructuredSelector} from 'reselect'; ...@@ -3,8 +3,8 @@ import {createStructuredSelector} from 'reselect';
import {drawSimpleLegend} from 'd3render//legend'; import {drawSimpleLegend} from 'd3render//legend';
import {link} from 'ui/lib/d3-redux'; import {link} from 'ui/lib/d3-redux';
import {getMainLayout} from 'ivhydrograph/selectors/layout'; import {getMainLayout} from './selectors/layout';
import {getLegendMarkerRows} from 'ivhydrograph/selectors/legend-data'; import {getLegendMarkerRows} from './selectors/legend-data';
export const drawTimeSeriesLegend = function(elem, store) { export const drawTimeSeriesLegend = function(elem, store) {
......
...@@ -4,7 +4,7 @@ import {select, selectAll} from 'd3-selection'; ...@@ -4,7 +4,7 @@ import {select, selectAll} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {Actions} from 'ml/store/instantaneous-value-time-series-state'; import {Actions} from 'ml/store/instantaneous-value-time-series-state';
import {drawTimeSeriesLegend} from 'ivhydrograph/legend'; import {drawTimeSeriesLegend} from './legend';
describe('monitoring-location/components/hydrograph/legend module', () => { describe('monitoring-location/components/hydrograph/legend module', () => {
......
...@@ -10,7 +10,7 @@ import{link} from 'ui/lib/d3-redux'; ...@@ -10,7 +10,7 @@ import{link} from 'ui/lib/d3-redux';
import {getCurrentMethodID, getAllMethodsForCurrentVariable} from 'ml/selectors/time-series-selector'; import {getCurrentMethodID, getAllMethodsForCurrentVariable} from 'ml/selectors/time-series-selector';
import {Actions} from 'ml/store/instantaneous-value-time-series-state'; import {Actions} from 'ml/store/instantaneous-value-time-series-state';
import { } from 'ivhydrograph/selectors/time-series-data'; import { } from './selectors/time-series-data';
export const drawMethodPicker = function(elem, store) { export const drawMethodPicker = function(elem, store) {
const pickerContainer = elem.insert('div', ':nth-child(2)') const pickerContainer = elem.insert('div', ':nth-child(2)')
......
...@@ -2,7 +2,7 @@ import {select} from 'd3-selection'; ...@@ -2,7 +2,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {drawMethodPicker} from 'ivhydrograph/method-picker'; import {drawMethodPicker} from './method-picker';
describe('monitoring-location/components/hydrograph/method-picker', () => { describe('monitoring-location/components/hydrograph/method-picker', () => {
......
...@@ -7,8 +7,8 @@ import {appendTooltip} from 'd3render/tooltips'; ...@@ -7,8 +7,8 @@ import {appendTooltip} from 'd3render/tooltips';
import {Actions} from 'ml/store/instantaneous-value-time-series-data'; import {Actions} from 'ml/store/instantaneous-value-time-series-data';
import {MASK_DESC} from 'ivhydrograph/selectors/drawing-data'; import {MASK_DESC} from './selectors/drawing-data';
import {SPARK_LINE_DIM, CIRCLE_RADIUS_SINGLE_PT} from 'ivhydrograph/selectors/layout'; import {SPARK_LINE_DIM, CIRCLE_RADIUS_SINGLE_PT} from './selectors/layout';
/** /**
* Draw a sparkline in a selected SVG element * Draw a sparkline in a selected SVG element
......
...@@ -3,8 +3,7 @@ import {select} from 'd3-selection'; ...@@ -3,8 +3,7 @@ import {select} from 'd3-selection';
import {configureStore} from 'ml/store'; import {configureStore} from 'ml/store';
import {addSparkLine, plotSeriesSelectTable} from 'ivhydrograph/parameters'; import {addSparkLine, plotSeriesSelectTable} from './parameters';
describe('monitoring-location/components/hydrograph/parameters module', () => { describe('monitoring-location/components/hydrograph/parameters module', () => {
......
...@@ -8,8 +8,8 @@ import {createSelector} from 'reselect'; ...@@ -8,8 +8,8 @@ import {createSelector} from 'reselect';
import {getTimeSeries} from 'ml/selectors/time-series-selector'; import {getTimeSeries} from 'ml/selectors/time-series-selector';
import {getTsCursorPoints} from 'ivhydrograph/selectors/cursor'; import {getTsCursorPoints} from './cursor';
import {getMainYScale} from 'ivhydrograph/selectors/scales'; import {getMainYScale} from './scales';
/* /*
* Returns a Redux selector function that returns true if the audible interface is playing. * Returns a Redux selector function that returns true if the audible interface is playing.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment