Merge branch '42-integration-roc-result' into 'develop'

Resolve "Integration ROC Result"

Closes #42

See merge request sibmip/gateway!20

api/src/engine/models/result/common/chart-axis.model.ts

@@ -6,5 +6,5 @@ export class ChartAxis {
   label?: string;
 
   @Field(() => [String], { nullable: true, defaultValue: [] })
-  categories: string[];
+  categories?: string[];
 }

api/src/engine/models/result/common/result-union.model.ts

 import { createUnionType } from '@nestjs/graphql';
 import { GroupsResult } from '../groups-result.model';
+import { HeatMapResult } from '../heat-map-result.model';
+import { LineChartResult } from '../line-chart-result.model';
 import { RawResult } from '../raw-result.model';
 import { TableResult } from '../table-result.model';
 
 export const ResultUnion = createUnionType({
   name: 'ResultUnion',
-  types: () => [TableResult, RawResult, GroupsResult],
+  types: () => [
+    TableResult,
+    RawResult,
+    GroupsResult,
+    HeatMapResult,
+    LineChartResult,
+  ],
   resolveType(value) {
     if (value.headers) {
       return TableResult;
@@ -19,6 +27,14 @@ export const ResultUnion = createUnionType({
       return GroupsResult;
     }
 
+    if (value.matrix) {
+      return HeatMapResult;
+    }
+
+    if (value.x) {
+      return LineChartResult;
+    }
+
     return null;
   },
 });

api/src/engine/models/result/heat-map-result.model.ts

@@ -10,9 +10,9 @@ export class HeatMapResult extends Result {
   @Field(() => [[Number]])
   matrix: number[][];
 
-  @Field(() => [ChartAxis])
+  @Field(() => ChartAxis)
   xAxis: ChartAxis;
 
-  @Field(() => [ChartAxis])
+  @Field(() => ChartAxis)
   yAxis: ChartAxis;
 }

api/src/engine/models/result/line-chart-result.model.ts

+import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
+import { ChartAxis } from './common/chart-axis.model';
+import { Result } from './common/result.model';
+
+export enum LineType {
+  NORMAL,
+  DASHED,
+}
+
+registerEnumType(LineType, {
+  name: 'LineType',
+});
+
+@ObjectType()
+export class ExtraLineInfo {
+  @Field()
+  label: string;
+
+  @Field(() => [String])
+  values: string[];
+}
+
+@ObjectType()
+export class LineResult {
+  @Field()
+  label: string;
+
+  @Field(() => [Number])
+  x: number[];
+
+  @Field(() => [Number])
+  y: number[];
+
+  @Field(() => [ExtraLineInfo], { nullable: true, defaultValue: [] })
+  extraLineInfos?: ExtraLineInfo[];
+
+  @Field(() => LineType, { nullable: true, defaultValue: LineType.NORMAL })
+  type?: LineType;
+}
+
+@ObjectType()
+export class LineChartResult extends Result {
+  @Field()
+  name: string;
+
+  @Field(() => ChartAxis, { nullable: true })
+  xAxis?: ChartAxis;
+
+  @Field(() => ChartAxis, { nullable: true })
+  yAxis?: ChartAxis;
+
+  @Field(() => [LineResult])
+  lines: LineResult[];
+}

api/src/schema.gql

@@ -63,7 +63,7 @@ type GroupResult {
   results: [ResultUnion!]!
 }
 
-union ResultUnion = TableResult | RawResult | GroupsResult
+union ResultUnion = TableResult | RawResult | GroupsResult | HeatMapResult | LineChartResult
 
 type TableResult {
   name: String!
@@ -84,6 +84,43 @@ type GroupsResult {
   groups: [GroupResult!]!
 }
 
+type HeatMapResult {
+  name: String!
+  matrix: [[Float!]!]!
+  xAxis: ChartAxis!
+  yAxis: ChartAxis!
+}
+
+type LineChartResult {
+  name: String!
+  xAxis: ChartAxis
+  yAxis: ChartAxis
+  lines: [LineResult!]!
+}
+
+type ChartAxis {
+  label: String
+  categories: [String!]
+}
+
+type ExtraLineInfo {
+  label: String!
+  values: [String!]!
+}
+
+type LineResult {
+  label: String!
+  x: [Float!]!
+  y: [Float!]!
+  extraLineInfos: [ExtraLineInfo!]
+  type: LineType
+}
+
+enum LineType {
+  NORMAL
+  DASHED
+}
+
 type Header {
   name: String!
   type: String!