Merge pull request #21 from gemini-hlsw/SCHED-573

SCHED-573: Fix building in CI
gemini-hlsw · Jan 12, 2024 · 6ece39a · 6ece39a
2 parents d606579 + 66643ab
commit 6ece39a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/components/ControlPanel/ControlPanel.tsx b/src/components/ControlPanel/ControlPanel.tsx
@@ -57,7 +57,7 @@ export default function ControlPanel() {
           sites: siteState,
           numNightsToSchedule: 3,
           mode: 'VALIDATION',
-          thesis: thesis,
+          thesisFactor: thesis,
           power: power,
           metPower: metPower,
           visPower: visPower,

diff --git a/src/components/SchedulerPlot/SchedulerPlot.tsx b/src/components/SchedulerPlot/SchedulerPlot.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useRef } from 'react';
 import Highcharts, { SeriesArearangeOptions } from 'highcharts';
-import HighchartsReact from 'highcharts-react-official';
+import HighchartsReact, { HighchartsReactRefObject } from 'highcharts-react-official';
 import HighchartMore from 'highcharts/highcharts-more';
 HighchartMore(Highcharts)
 
@@ -28,7 +28,7 @@ const AltAzPlot: React.FC<AltAzPlotProps> = ({ data }) => {
   const gridLineColor = theme === 'light' ? '#e6e6e6' : '#444';
 
   // ref for post-render use
-  const chartRef = useRef<HighchartsReact.Props>(null);
+  const chartRef = useRef<HighchartsReactRefObject>(null);
 
   // Array of colors from Highcharts
   const colorsOption = Highcharts.getOptions().colors;
@@ -108,8 +108,8 @@ const AltAzPlot: React.FC<AltAzPlotProps> = ({ data }) => {
         const x = (d.startDate.getTime() + d.endDate.getTime()) / 2;
         const y = Math.max(...d.yPoints) / 2;
 
-        const xPos = chart.xAxis[0].toPixels(x);
-        const yPos = chart.yAxis[0].toPixels(y);
+        const xPos = chart.xAxis[0].toPixels(x, false);
+        const yPos = chart.yAxis[0].toPixels(y, false);
 
         chart.renderer.text(d.label, xPos, yPos)
           .attr({

diff --git a/src/components/Validation/Validation.tsx b/src/components/Validation/Validation.tsx
@@ -9,10 +9,11 @@ import "./Validation.scss"
 
 // For testing
 import SummaryTable from "../SummaryTable/SummaryTable"
+import RankerTweaker from "../RankerTweaker/RankerTweaker"
 
 import { Panel } from "primereact/panel"
 import Results from "../Results/Results"
-import RankerTweaker from "../RankerTweaker/rankerTweaker"
+
 
 
 export default function Validation() {