Update parsing of sampling to match tsp specification (#354)

Update parsing of sampling to match tsp specification

The tsp-typescript-client was modified to comply to tsp
specification for sampling, update accordingly here.

Account for new xRanges and xCategories for generic xy output component.

Contributes to fix:
eclipse-tracecompass-incubator/org.eclipse.tracecompass.incubator#236

Upgrade to tsp-typescript-client v0.9.0.

Signed-off-by: Bernd Hufmann <[email protected]>
Co-authored-by: Siwei Zhang <[email protected]>
Co-authored-by: Bernd Hufmann <[email protected]>

Author: 3 people

base/package.json

@@ -16,7 +16,7 @@
         "src"
     ],
     "dependencies": {
-        "tsp-typescript-client": "^0.8.0"
+        "tsp-typescript-client": "^0.9.0"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^6.0.0",

react-components/package.json

@@ -36,7 +36,7 @@
         "react-virtualized": "^9.21.0",
         "timeline-chart": "^0.4.2",
         "traceviewer-base": "0.9.1",
-        "tsp-typescript-client": "^0.8.0"
+        "tsp-typescript-client": "^0.9.0"
     },
     "devDependencies": {
         "@testing-library/react": "^15.0.6",

react-components/src/components/generic-xy-output-component.tsx

@@ -320,8 +320,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
 
         const style = (series[0] as any)?.style?.values?.['series-type'] as string | undefined;
         const st = style?.toLowerCase();
-        const xv = series[0].xValues as Sampling;
-        this.isTimeAxis = isTimestampSampling(xv);
+        this.isTimeAxis = !!series[0].xValues;
         this.mode = st === 'scatter' ? ChartMode.SCATTER : st === 'line' ? ChartMode.LINE : ChartMode.BAR;
 
         const xy = this.buildXYData(series, this.mode);
@@ -342,9 +341,9 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
     }
 
     private buildBarChartData(seriesObj: XYSeries[]): GenericXYData {
-        const xValues = seriesObj[0].xValues;
+        const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
         const unit = seriesObj[0]?.xValuesDescription?.unit || '';
-        const labels = this.buildLabels(xValues, unit);
+        const labels = this.buildLabels(xValues as Sampling, unit);
         const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
             const color = this.colors.get(s.seriesName);
             return {
@@ -361,9 +360,9 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
     }
 
     private buildLineOrScatterChartData(seriesObj: XYSeries[], mode: ChartMode): GenericXYData {
-        const xValues = seriesObj[0].xValues;
+        const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
         const unit = seriesObj[0]?.xValuesDescription?.unit || '';
-        const labels = this.buildLabels(xValues, unit);
+        const labels = this.buildLabels(xValues as Sampling, unit);
 
         const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
             const color = this.colors.get(s.seriesName);
@@ -388,7 +387,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
 
     private buildLabels(xValues: Sampling, unit: string): string[] {
         if (isRangeSampling(xValues)) {
-            return xValues.map(range => `[${range[0]} ${unit}, ${range[1]} ${unit}]`);
+            return xValues.map(range => `[${range.start} ${unit}, ${range.end} ${unit}]`);
         } else if (isCategorySampling(xValues)) {
             return xValues.map(val => `${val} ${unit}`);
         } else if (isTimestampSampling(xValues)) {