diff --git a/api/src/engine/connectors/exareme/converters.ts b/api/src/engine/connectors/exareme/converters.ts index 41d9fce2941019d3341d0c7c2018e9ebc1b8e79e..8a23fd5f9ff106c6cc2a0995d48eac079946cd30 100644 --- a/api/src/engine/connectors/exareme/converters.ts +++ b/api/src/engine/connectors/exareme/converters.ts @@ -95,6 +95,14 @@ export const experimentInputToData = (data: ExperimentCreateInput) => { name: data.name, }; + if (data.coVariables && data.coVariables.length) { + params.algorithm.parameters.push({ + name: 'x', + label: 'x', + value: data.coVariables.join(','), + }); + } + return params; }; diff --git a/api/src/engine/connectors/exareme/transformations.ts b/api/src/engine/connectors/exareme/transformations.ts index 5940599c582bd5293656b834ffd641e422e2cc03..2fc8039f0a656b1bc1dac8a9632ffc6d9088ed3c 100644 --- a/api/src/engine/connectors/exareme/transformations.ts +++ b/api/src/engine/connectors/exareme/transformations.ts @@ -5,7 +5,7 @@ import * as jsonata from 'jsonata'; // old import style needed due to 'export = export const transformToAlgorithms = jsonata(` ( - $params := ["y", "pathology", "dataset", "filter"]; + $params := ["y", "pathology", "dataset", "filter", "x"]; $toArray := function($x) { $type($x) = 'array' ? $x : [$x]}; @@ -30,7 +30,7 @@ export const transformToAlgorithms = jsonata(` export const transformToExperiment = jsonata(` ( - $params := ["y", "pathology", "dataset", "filter"]; + $params := ["y", "pathology", "dataset", "filter", "x"]; $toArray := function($x) { $type($x) = 'array' ? $x : [$x]}; @@ -46,6 +46,7 @@ export const transformToExperiment = jsonata(` "updateAt": updated, "domain": algorithm.parameters[name = "pathology"].value, "variables": $split(algorithm.parameters[name = "y"].value, ','), + "coVariables": $toArray($split(algorithm.parameters[name = "x"].value, ',')), "filter": algorithm.parameters[name = "filter"].value, "datasets": $split(algorithm.parameters[name = "dataset"].value, ','), "algorithm": { diff --git a/api/src/engine/models/experiment/experiment.model.ts b/api/src/engine/models/experiment/experiment.model.ts index 06e28b4b2e1c93e8dac7c6e7dc828c706f370c8a..0a76e9d9a3b4ba51447dfced1de8c71b40310d74 100644 --- a/api/src/engine/models/experiment/experiment.model.ts +++ b/api/src/engine/models/experiment/experiment.model.ts @@ -43,6 +43,9 @@ export class Experiment { @Field(() => [String]) variables: string[]; + @Field(() => [String], { nullable: true, defaultValue: [] }) + coVariables?: string[]; + @Field() algorithm: Algorithm; diff --git a/api/src/engine/models/experiment/input/experiment-create.input.ts b/api/src/engine/models/experiment/input/experiment-create.input.ts index 85a54049cffde188cd770237ba53ef1ccf847027..c817e9752691c995c3a7b658525579f7fa868166 100644 --- a/api/src/engine/models/experiment/input/experiment-create.input.ts +++ b/api/src/engine/models/experiment/input/experiment-create.input.ts @@ -15,6 +15,9 @@ export class ExperimentCreateInput { @Field(() => [String]) variables: string[]; + @Field(() => [String], { nullable: true, defaultValue: [] }) + coVariables?: string[]; + @Field() algorithm: AlgorithmInput; diff --git a/api/src/schema.gql b/api/src/schema.gql index cc8aaa3d271e15134ff597424c864db35081e988..5f4acdc167a94650fcb054e78d01ed433c1f00c7 100644 --- a/api/src/schema.gql +++ b/api/src/schema.gql @@ -37,7 +37,7 @@ type Domain { } type AlgorithmParameter { - name: String! + id: String! value: [String!] label: String description: String @@ -50,7 +50,7 @@ type AlgorithmParameter { } type Algorithm { - name: String! + id: String! parameters: [AlgorithmParameter!] label: String type: String @@ -140,6 +140,7 @@ type Experiment { filter: String domain: String! variables: [String!]! + coVariables: [String!] algorithm: Algorithm! name: String! } @@ -158,6 +159,7 @@ type PartialExperiment { filter: String domain: String variables: [String!] + coVariables: [String!] algorithm: Algorithm name: String } @@ -187,22 +189,24 @@ input ExperimentCreateInput { filter: String domain: String! variables: [String!]! + coVariables: [String!] = [] algorithm: AlgorithmInput! name: String! } input AlgorithmInput { - name: String! + id: String! parameters: [AlgorithmParamInput!] = [] type: String! } input AlgorithmParamInput { - name: String! + id: String! value: [String!]! } input ExperimentEditInput { name: String + shared: Boolean viewed: Boolean }