From 278df1fea089cf78421fb23961b4fd21d24198aa Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Tue, 5 Feb 2019 21:21:29 -0300 Subject: [PATCH 1/3] Adding support for indicator bots --- client/package.json | 2 +- client/src/GraphQL/Calls/teams.js | 4 ++-- client/src/GraphQL/models.js | 15 ++++++++++++++- client/src/views/Clone/Add/index.js | 18 ++++++++++-------- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/client/package.json b/client/package.json index c0907e711..fd2bcc7d4 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@superalgos/operations-client", - "version": "0.0.8", + "version": "0.0.9", "description": "Superalgos Operations client-side web app", "main": "src/index.js", "dependencies": { diff --git a/client/src/GraphQL/Calls/teams.js b/client/src/GraphQL/Calls/teams.js index 7329d3e07..0a27afd3c 100644 --- a/client/src/GraphQL/Calls/teams.js +++ b/client/src/GraphQL/Calls/teams.js @@ -1,8 +1,8 @@ import gql from 'graphql-tag'; export const GET_ALL_TEAMS_QUERY = gql` - query Teams_FbByTeamMember { - teams_FbByTeamMember { + query { + teams_TeamsByOwner { id name slug diff --git a/client/src/GraphQL/models.js b/client/src/GraphQL/models.js index 474df1fcf..50dd8a322 100644 --- a/client/src/GraphQL/models.js +++ b/client/src/GraphQL/models.js @@ -1,8 +1,21 @@ const types = [ 'Live', 'Competition', 'Backtest' ] -const startModes = [ 'All Months', 'One Month', 'No Time' ] const availableMonths = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"] +const startModes = [ + { + name: 'All Months', + value: 'allMonths' + }, + { + name: 'One Month', + value: 'oneMonth' + }, + { + name: 'No Time', + value: 'noTime' + } +] const exchanges = [ { id: '1', diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js index 54d42e0a8..e86bee6eb 100644 --- a/client/src/views/Clone/Add/index.js +++ b/client/src/views/Clone/Add/index.js @@ -119,7 +119,7 @@ class AddClone extends Component { ) } - if(!isDefined(data.teams_FbByTeamMember)){ + if(!isDefined(data.teams_TeamsByOwner)){ return ( @@ -289,8 +291,8 @@ class AddClone extends Component { fullWidth > {startModes.map(option => ( - - {option} + + {option.name} ))} From 2387aca8a2ba6d1622ab9c1bdfe3ef309a080c1f Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Tue, 5 Feb 2019 21:47:56 -0300 Subject: [PATCH 2/3] Adding lowercase kubernertes job names --- server/src/schema/cloneDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js index ec4ee89e2..74849e583 100644 --- a/server/src/schema/cloneDetails.js +++ b/server/src/schema/cloneDetails.js @@ -17,7 +17,7 @@ const cloneDetails = async(authId, team, clone) => { clone.kind = selectedBot.kind clone.teamSlug = team.slug clone.botSlug = selectedBot.slug - clone.cloneName = clone.teamSlug + '-' + clone.botSlug + '-' + clone.mode.toLowerCase() + clone.cloneName = (clone.teamSlug + '-' + clone.botSlug + '-' + clone.mode).toLowerCase() clone.teamName = team.name clone.botName = selectedBot.name clone.botAvatar = selectedBot.avatar From 709a6cb770a5992242afda61a24e2b1215ba20d4 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Tue, 5 Feb 2019 21:51:08 -0300 Subject: [PATCH 3/3] Fixing multiple teams and mulitple fbs --- client/package.json | 2 +- client/src/views/Clone/Add/index.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/package.json b/client/package.json index fd2bcc7d4..a3f97354c 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@superalgos/operations-client", - "version": "0.0.9", + "version": "0.0.11", "description": "Superalgos Operations client-side web app", "main": "src/index.js", "dependencies": { diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js index e86bee6eb..0a90f3fcb 100644 --- a/client/src/views/Clone/Add/index.js +++ b/client/src/views/Clone/Add/index.js @@ -146,7 +146,7 @@ class AddClone extends Component { > { data.teams_TeamsByOwner.map(team => ( - team.map(financialBeing => ( + team.fb.map(financialBeing => ( {team.name + '/' + financialBeing.name} @@ -373,7 +373,7 @@ class AddClone extends Component { - You will your clone information under Active Clones until it finishes the execution, then it will moved to the History. + You will be able to query your clone information under Active Clones until it finishes the execution, then it will moved to the History.
@@ -412,11 +412,13 @@ class AddClone extends Component { setSelectedBot(botId){ if(isDefined(this.teams)){ - for (var i = 0; i < this.teams.fb.length; i++) { - if(this.teams.fb[i].id === botId){ - this.setState({selectedBot:this.teams.fb[i]}) - this.setState({teamId:this.teams.id}) - return + for (var j = 0; j < this.teams.length; j++) { + for (var i = 0; i < this.teams[j].fb.length; i++) { + if(this.teams[j].fb[i].id === botId){ + this.setState({selectedBot:this.teams[j].fb[i]}) + this.setState({teamId:this.teams[j].id}) + return + } } } }