From f3da0ca39763d10bf5506ea39e240950ae9b7076 Mon Sep 17 00:00:00 2001
From: Steve Reis <stevereis93@gmail.com>
Date: Wed, 30 Mar 2022 17:24:19 +0200
Subject: [PATCH] fix test and result type for barchart
---
.../exareme/handlers/algorithms/PCA.handler.spec.ts | 4 ++--
.../connectors/exareme/handlers/algorithms/PCA.handler.ts | 4 +---
api/src/engine/models/result/bar-chart-result.model.ts | 4 ++--
api/src/schema.gql | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.spec.ts b/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.spec.ts
index a5885b8..9aa0115 100644
--- a/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.spec.ts
+++ b/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.spec.ts
@@ -90,8 +90,8 @@ describe('PCA result handler', () => {
});
exp.results.forEach((it) => {
if (it['barValues']) {
- const heatmap = it as BarChartResult;
- expect(heatmap.barValues).toEqual(data.eigen_vals);
+ const barchart = it as BarChartResult;
+ expect(barchart.barValues).toEqual(data.eigen_vals);
}
});
});
diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.ts b/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.ts
index 306b146..3278962 100644
--- a/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.ts
+++ b/api/src/engine/connectors/exareme/handlers/algorithms/PCA.handler.ts
@@ -16,9 +16,7 @@ export default class PCAHandler extends BaseHandler {
barValues: data['eigen_vals'],
xAxis: {
label: 'Dimensions',
- categories: [...Array(exp.variables.length).keys()]
- .map((i) => i + 1)
- .map(String),
+ categories: exp.variables.map((_, i) => i + 1).map(String),
},
hasConnectedBars: true,
yAxis: {
diff --git a/api/src/engine/models/result/bar-chart-result.model.ts b/api/src/engine/models/result/bar-chart-result.model.ts
index da350d3..6ba9c04 100644
--- a/api/src/engine/models/result/bar-chart-result.model.ts
+++ b/api/src/engine/models/result/bar-chart-result.model.ts
@@ -13,8 +13,8 @@ export class BarChartResult extends Result {
@Field(() => ChartAxis, { nullable: true })
yAxis?: ChartAxis;
- @Field(() => [String], { description: "List of bar's value" })
- barValues: string[];
+ @Field(() => [Number], { description: "List of bar's value" })
+ barValues: number[];
@Field({ defaultValue: false, nullable: true })
hasConnectedBars?: boolean;
diff --git a/api/src/schema.gql b/api/src/schema.gql
index 2217a0a..8a0e240 100644
--- a/api/src/schema.gql
+++ b/api/src/schema.gql
@@ -153,7 +153,7 @@ type BarChartResult {
yAxis: ChartAxis
"""List of bar's value"""
- barValues: [String!]!
+ barValues: [Float!]!
hasConnectedBars: Boolean
}
--
GitLab