From 3ab45f55404f0eb829822e384f65d66a34e7781e Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 10 Jan 2023 10:03:35 -0800 Subject: [PATCH] Merge 2.x to main for #122 and #150 (#154) Signed-off-by: vamsi-amazon Signed-off-by: Eric Wei Signed-off-by: Sayali Gaikawad Signed-off-by: Joshua Li Signed-off-by: Rupal Mahajan Signed-off-by: Marcel Kalai Co-authored-by: vamsi-amazon Co-authored-by: Eric Wei Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Derek Ho Co-authored-by: Sayali Gaikawad Co-authored-by: Rupal Mahajan Co-authored-by: Shenoy Pratik Co-authored-by: Marcel Kalai <57996611+m-kalai@users.noreply.github.com> --- gantt-chart/public/components/gantt_chart.tsx | 2 +- gantt-chart/yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gantt-chart/public/components/gantt_chart.tsx b/gantt-chart/public/components/gantt_chart.tsx index e193185..14d41af 100644 --- 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 index 2cd84ff..e8624ec 100644 --- 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"