Merge 2.x to main for #122 and #150 (#154)

Signed-off-by: vamsi-amazon <[email protected]> Signed-off-by: Eric Wei <[email protected]> Signed-off-by: Sayali Gaikawad <[email protected]> Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Rupal Mahajan <[email protected]> Signed-off-by: Marcel Kalai <[email protected]> Co-authored-by: vamsi-amazon <[email protected]> Co-authored-by: Eric Wei <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Derek Ho <[email protected]> Co-authored-by: Sayali Gaikawad <[email protected]> Co-authored-by: Rupal Mahajan <[email protected]> Co-authored-by: Shenoy Pratik <[email protected]> Co-authored-by: Marcel Kalai <[email protected]>
opensearch-project · Jan 10, 2023 · 3ab45f5 · 3ab45f5
1 parent c8ecfa1
commit 3ab45f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gantt-chart/public/components/gantt_chart.tsx b/gantt-chart/public/components/gantt_chart.tsx
@@ -52,7 +52,7 @@ export function GanttChart({
       const rawStartTime: number = getStartTime(document);
       // subtract with start time of earliest trace to get relative start time
       const startTime: number = rawStartTime - minStartTime;
-      const duration: number = _.get(document, visParams.durationField);
+      const duration: number = Number(_.get(document, visParams.durationField));
       maxEndTime = Math.max(maxEndTime, rawStartTime + duration);
 
       const label: string = _.get(document, visParams.labelField);

diff --git a/gantt-chart/yarn.lock b/gantt-chart/yarn.lock
@@ -1593,7 +1593,7 @@ react-plotly.js@^2.4.0:
   resolved "https://registry.yarnpkg.com/react-plotly.js/-/react-plotly.js-2.5.1.tgz#11182bf599ef11a0dbfcd171c6f5645535a2b486"
   integrity sha512-Oya14whSHvPsYXdI0nHOGs1pZhMzV2edV7HAW1xFHD58Y73m/LbG2Encvyz1tztL0vfjph0JNhiwO8cGBJnlhg==
   dependencies:
-    prop-types "^15.7.2"
+    prop-types "^15.8.1"
 
 readable-stream@^2.2.2:
   version "2.3.7"