From f7dfff712eeb0fd2a2eef6e7d09a492a5a5c2497 Mon Sep 17 00:00:00 2001
From: Aaron Briggs <abriggs@contractor.usgs.gov>
Date: Mon, 19 Oct 2020 07:55:28 -0500
Subject: [PATCH] import changes for d3 rendering test files
---
assets/rollup.config.js | 2 +-
assets/src/scripts/d3-rendering/accessibility.spec.js | 2 +-
assets/src/scripts/d3-rendering/alerts.spec.js | 2 +-
assets/src/scripts/d3-rendering/axes.spec.js | 2 +-
assets/src/scripts/d3-rendering/cursor-slider.spec.js | 2 +-
assets/src/scripts/d3-rendering/data-masks.spec.js | 2 +-
assets/src/scripts/d3-rendering/graph-tooltip.spec.js | 2 +-
assets/src/scripts/d3-rendering/legend.spec.js | 2 +-
assets/src/scripts/d3-rendering/loading-indicator.spec.js | 2 +-
assets/src/scripts/d3-rendering/markers.spec.js | 2 +-
assets/src/scripts/d3-rendering/tick-marks.spec.js | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/assets/rollup.config.js b/assets/rollup.config.js
index 43571050f..d122c45a5 100644
--- a/assets/rollup.config.js
+++ b/assets/rollup.config.js
@@ -18,8 +18,8 @@ const env = process.env.NODE_ENV || 'development';
const getBundleConfig = function(src, dest) {
const hydrographEntries = [
- {find: 'ml', replacement: path.resolve(__dirname, 'src/scripts/monitoring-location')},
{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')}
diff --git a/assets/src/scripts/d3-rendering/accessibility.spec.js b/assets/src/scripts/d3-rendering/accessibility.spec.js
index 76e7665e2..e9465cf9c 100644
--- a/assets/src/scripts/d3-rendering/accessibility.spec.js
+++ b/assets/src/scripts/d3-rendering/accessibility.spec.js
@@ -1,4 +1,4 @@
-import {addSVGAccessibility, addSROnlyTable} from './accessibility';
+import {addSVGAccessibility, addSROnlyTable} from 'd3render/accessibility';
import {select} from 'd3-selection';
describe('svgAccessibility tests', () => {
diff --git a/assets/src/scripts/d3-rendering/alerts.spec.js b/assets/src/scripts/d3-rendering/alerts.spec.js
index d2b0aca42..60c3b5421 100644
--- a/assets/src/scripts/d3-rendering/alerts.spec.js
+++ b/assets/src/scripts/d3-rendering/alerts.spec.js
@@ -1,6 +1,6 @@
import {select} from 'd3-selection';
-import {drawInfoAlert, drawErrorAlert, drawSuccessAlert, drawWarningAlert} from './alerts';
+import {drawInfoAlert, drawErrorAlert, drawSuccessAlert, drawWarningAlert} from 'd3render/alerts';
describe('alerts module', () => {
let container;
diff --git a/assets/src/scripts/d3-rendering/axes.spec.js b/assets/src/scripts/d3-rendering/axes.spec.js
index eeda4ba82..400e4cdba 100644
--- a/assets/src/scripts/d3-rendering/axes.spec.js
+++ b/assets/src/scripts/d3-rendering/axes.spec.js
@@ -1,6 +1,6 @@
import {select} from 'd3-selection';
-import {appendXAxis, appendYAxis, appendSecondaryYAxis, appendAxes} from './axes';
+import {appendXAxis, appendYAxis, appendSecondaryYAxis, appendAxes} from 'd3render/axes';
describe('axes module', () => {
let svg, layout;
diff --git a/assets/src/scripts/d3-rendering/cursor-slider.spec.js b/assets/src/scripts/d3-rendering/cursor-slider.spec.js
index fc5f3533b..3edcced23 100644
--- a/assets/src/scripts/d3-rendering/cursor-slider.spec.js
+++ b/assets/src/scripts/d3-rendering/cursor-slider.spec.js
@@ -1,7 +1,7 @@
import {scaleLinear} from 'd3-scale';
import {select} from 'd3-selection';
-import {drawCursorSlider} from './cursor-slider';
+import {drawCursorSlider} from 'd3render/cursor-slider';
describe('cursor-slider', () => {
describe('drawCursorSlider', () => {
diff --git a/assets/src/scripts/d3-rendering/data-masks.spec.js b/assets/src/scripts/d3-rendering/data-masks.spec.js
index 98d83552c..5d1219716 100644
--- a/assets/src/scripts/d3-rendering/data-masks.spec.js
+++ b/assets/src/scripts/d3-rendering/data-masks.spec.js
@@ -1,6 +1,6 @@
import {select} from 'd3-selection';
-import {renderMaskDefs} from './data-masks';
+import {renderMaskDefs} from 'd3render/data-masks';
describe('d3-rendering/data-masks', () => {
describe('renderMaskDefs', () => {
diff --git a/assets/src/scripts/d3-rendering/graph-tooltip.spec.js b/assets/src/scripts/d3-rendering/graph-tooltip.spec.js
index afe4ad7a1..679328ec6 100644
--- a/assets/src/scripts/d3-rendering/graph-tooltip.spec.js
+++ b/assets/src/scripts/d3-rendering/graph-tooltip.spec.js
@@ -1,7 +1,7 @@
import {scaleLinear} from 'd3-scale';
import {select} from 'd3-selection';
-import {drawFocusOverlay, drawFocusLine, drawFocusCircles} from './graph-tooltip';
+import {drawFocusOverlay, drawFocusLine, drawFocusCircles} from 'd3render/graph-tooltip';
describe('graph-tooltip module', () => {
let svg;
diff --git a/assets/src/scripts/d3-rendering/legend.spec.js b/assets/src/scripts/d3-rendering/legend.spec.js
index 4f680e7a6..855555c5b 100644
--- a/assets/src/scripts/d3-rendering/legend.spec.js
+++ b/assets/src/scripts/d3-rendering/legend.spec.js
@@ -1,5 +1,5 @@
import {select} from 'd3-selection';
-import {lineMarker, rectangleMarker, textOnlyMarker} from './markers';
+import {lineMarker, rectangleMarker, textOnlyMarker} from 'd3render/markers';
import {drawSimpleLegend} from './legend';
describe('Legend module', () => {
diff --git a/assets/src/scripts/d3-rendering/loading-indicator.spec.js b/assets/src/scripts/d3-rendering/loading-indicator.spec.js
index 429df83fe..751a69332 100644
--- a/assets/src/scripts/d3-rendering/loading-indicator.spec.js
+++ b/assets/src/scripts/d3-rendering/loading-indicator.spec.js
@@ -1,5 +1,5 @@
import {select} from 'd3-selection';
-import {drawLoadingIndicator} from './loading-indicator';
+import {drawLoadingIndicator} from 'd3render/loading-indicator';
describe('loading indicator', () => {
let div;
diff --git a/assets/src/scripts/d3-rendering/markers.spec.js b/assets/src/scripts/d3-rendering/markers.spec.js
index a3cf63fc8..93fa1f6e9 100644
--- a/assets/src/scripts/d3-rendering/markers.spec.js
+++ b/assets/src/scripts/d3-rendering/markers.spec.js
@@ -1,5 +1,5 @@
import {select} from 'd3-selection';
-import {lineMarker, circleMarker, rectangleMarker, textOnlyMarker} from './markers';
+import {lineMarker, circleMarker, rectangleMarker, textOnlyMarker} from 'd3render/markers';
describe('Markers module', () => {
diff --git a/assets/src/scripts/d3-rendering/tick-marks.spec.js b/assets/src/scripts/d3-rendering/tick-marks.spec.js
index 73b7b6a06..8c8c39e51 100644
--- a/assets/src/scripts/d3-rendering/tick-marks.spec.js
+++ b/assets/src/scripts/d3-rendering/tick-marks.spec.js
@@ -1,6 +1,6 @@
import {DateTime} from 'luxon';
-import {generateTimeTicks} from './tick-marks';
+import {generateTimeTicks} from 'd3render/tick-marks';
describe('generateTimeTicks', () => {
const startTime = 1520538281000;
--
GitLab