ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 21:27:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: bump d3-scale and use ESModule imports (#7245)

Browse Source 
Co-authored-by: John Hill <john.c.hill@nasa.gov>
This commit is contained in:
Jesse Mazzella 2023-11-28 14:07:34 -08:00 committed by GitHub
parent 39a31617b8
commit 97cb783c4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.webpack/webpack.common.js
View File

@ -71,7 +71,6 @@ const config = {
bourbon: 'bourbon.scss', bourbon: 'bourbon.scss',
'plotly-basic': 'plotly.js-basic-dist', 'plotly-basic': 'plotly.js-basic-dist',
'plotly-gl2d': 'plotly.js-gl2d-dist', 'plotly-gl2d': 'plotly.js-gl2d-dist',
'd3-scale': path.join(projectRootDir, 'node_modules/d3-scale/dist/d3-scale.min.js'),
printj: path.join(projectRootDir, 'node_modules/printj/dist/printj.min.js'), printj: path.join(projectRootDir, 'node_modules/printj/dist/printj.min.js'),
styles: path.join(projectRootDir, 'src/styles'), styles: path.join(projectRootDir, 'src/styles'),
MCT: path.join(projectRootDir, 'src/MCT'), MCT: path.join(projectRootDir, 'src/MCT'),

2
package.json
View File

@ -21,7 +21,7 @@
"cspell": "7.3.8", "cspell": "7.3.8",
"css-loader": "6.8.1", "css-loader": "6.8.1",
"d3-axis": "3.0.0", "d3-axis": "3.0.0",
"d3-scale": "3.3.0", "d3-scale": "4.0.2",
"d3-selection": "3.0.0", "d3-selection": "3.0.0",
"eslint": "8.54.0", "eslint": "8.54.0",
"eslint-config-prettier": "9.0.0", "eslint-config-prettier": "9.0.0",

6
src/plugins/imagery/components/ImageryTimeView.vue
View File

@ -27,7 +27,7 @@
</template> </template>
<script> <script>
import * as d3Scale from 'd3-scale'; import { scaleLinear, scaleUtc } from 'd3-scale';
import _ from 'lodash'; import _ from 'lodash';
import mount from 'utils/mount'; import mount from 'utils/mount';
@ -220,10 +220,10 @@ export default {
} }
if (timeSystem.isUTCBased) { if (timeSystem.isUTCBased) {
this.xScale = d3Scale.scaleUtc(); this.xScale = scaleUtc();
this.xScale.domain([new Date(this.viewBounds.start), new Date(this.viewBounds.end)]); this.xScale.domain([new Date(this.viewBounds.start), new Date(this.viewBounds.end)]);
} else { } else {
this.xScale = d3Scale.scaleLinear(); this.xScale = scaleLinear();
this.xScale.domain([this.viewBounds.start, this.viewBounds.end]); this.xScale.domain([this.viewBounds.start, this.viewBounds.end]);
} }

6
src/plugins/plan/components/PlanView.vue
View File

@ -53,7 +53,7 @@
</template> </template>
<script> <script>
import * as d3Scale from 'd3-scale'; import { scaleLinear, scaleUtc } from 'd3-scale';
import SwimLane from '@/ui/components/swim-lane/SwimLane.vue'; import SwimLane from '@/ui/components/swim-lane/SwimLane.vue';
@ -342,10 +342,10 @@ export default {
} }
if (timeSystem.isUTCBased) { if (timeSystem.isUTCBased) {
this.xScale = d3Scale.scaleUtc(); this.xScale = scaleUtc();
this.xScale.domain([new Date(this.viewBounds.start), new Date(this.viewBounds.end)]); this.xScale.domain([new Date(this.viewBounds.start), new Date(this.viewBounds.end)]);
} else { } else {
this.xScale = d3Scale.scaleLinear(); this.xScale = scaleLinear();
this.xScale.domain([this.viewBounds.start, this.viewBounds.end]); this.xScale.domain([this.viewBounds.start, this.viewBounds.end]);
} }

6
src/plugins/timeConductor/ConductorAxis.vue
View File

@ -27,7 +27,7 @@
<script> <script>
import * as d3Axis from 'd3-axis'; import * as d3Axis from 'd3-axis';
import * as d3Scale from 'd3-scale'; import { scaleLinear, scaleUtc } from 'd3-scale';
import * as d3Selection from 'd3-selection'; import * as d3Selection from 'd3-selection';
import { TIME_CONTEXT_EVENTS } from '../../api/time/constants'; import { TIME_CONTEXT_EVENTS } from '../../api/time/constants';
@ -135,9 +135,9 @@ export default {
//The D3 scale used depends on the type of time system as d3 //The D3 scale used depends on the type of time system as d3
// supports UTC out of the box. // supports UTC out of the box.
if (timeSystem.isUTCBased) { if (timeSystem.isUTCBased) {
this.xScale = d3Scale.scaleUtc(); this.xScale = scaleUtc();
} else { } else {
this.xScale = d3Scale.scaleLinear(); this.xScale = scaleLinear();
} }
this.xAxis.scale(this.xScale); this.xAxis.scale(this.xScale);

6
src/ui/components/TimeSystemAxis.vue
View File

@ -27,7 +27,7 @@
<script> <script>
import * as d3Axis from 'd3-axis'; import * as d3Axis from 'd3-axis';
import * as d3Scale from 'd3-scale'; import { scaleLinear, scaleUtc } from 'd3-scale';
import * as d3Selection from 'd3-selection'; import * as d3Selection from 'd3-selection';
import utcMultiTimeFormat from '@/plugins/timeConductor/utcMultiTimeFormat'; import utcMultiTimeFormat from '@/plugins/timeConductor/utcMultiTimeFormat';
@ -155,10 +155,10 @@ export default {
} }
if (timeSystem.isUTCBased) { if (timeSystem.isUTCBased) {
this.xScale = d3Scale.scaleUtc(); this.xScale = scaleUtc();
this.xScale.domain([new Date(bounds.start), new Date(bounds.end)]); this.xScale.domain([new Date(bounds.start), new Date(bounds.end)]);
} else { } else {
this.xScale = d3Scale.scaleLinear(); this.xScale = scaleLinear();
this.xScale.domain([bounds.start, bounds.end]); this.xScale.domain([bounds.start, bounds.end]);
} }