From 73815df2d725dff563d6d0424c7d9e3e2f42a338 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Sat, 23 Mar 2019 13:23:13 +0100 Subject: [PATCH] Update Trader to Trading --- client/src/views/Clone/Add/index.js | 10 +++++----- client/src/views/Clone/List/ListClones.js | 6 +++--- server/src/enums/BotTypes.js | 4 ++-- server/src/kubernetes/createClone.js | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js index fae774b3b..7cab25671 100644 --- a/client/src/views/Clone/Add/index.js +++ b/client/src/views/Clone/Add/index.js @@ -43,7 +43,7 @@ class AddClone extends Component { month: 1, processName: '', - //TraderBot + //TradingBot timePeriod: '01-hs', //Error handlers @@ -155,7 +155,7 @@ class AddClone extends Component { {this.state.selectedBot.kind} - { this.state.selectedBot.kind === "Trader" && + { this.state.selectedBot.kind === "Trading" && Available Running Modes are Backtest and Live. @@ -522,7 +522,7 @@ class AddClone extends Component { } } - if(this.state.selectedBot.kind === "Trader"){ + if(this.state.selectedBot.kind === "Trading"){ variables.clone.runAsTeam = this.state.runAsTeam variables.clone.processName = 'Trading-Process' variables.clone.timePeriod = this.state.timePeriod @@ -547,7 +547,7 @@ class AddClone extends Component { } getBotTypeFromKind(kind){ - if(kind === 'Trader') + if(kind === 'Trading') return 'Trading' else if(kind === 'Indicator') return 'Indicator' @@ -607,7 +607,7 @@ class AddClone extends Component { this.setState(state => ({ modeError: true })); } - if(this.state.selectedBot.kind !== "Trader" + if(this.state.selectedBot.kind !== "Trading" && this.state.processName.length < 1 ) { isError = true this.setState(state => ({ processNameError: true })); diff --git a/client/src/views/Clone/List/ListClones.js b/client/src/views/Clone/List/ListClones.js index 8ceae3594..3591965e9 100644 --- a/client/src/views/Clone/List/ListClones.js +++ b/client/src/views/Clone/List/ListClones.js @@ -44,7 +44,7 @@ class ListClones extends Component {
- { clone.processName } / { clone.botType === 'Trader' ? tradingStartModesList[clone.mode] : indicatorStartModes[clone.mode] } + { clone.processName } / { clone.botType === 'Trading' ? tradingStartModesList[clone.mode] : indicatorStartModes[clone.mode] }
@@ -90,7 +90,7 @@ class ListClones extends Component {
Last Execution: - { (clone.botType === 'Trader' && isDefined(clone.assetA) ) && + { (clone.botType === 'Trading' && isDefined(clone.assetA) ) && Buy Average: Sell Average: @@ -102,7 +102,7 @@ class ListClones extends Component {
{ toLocalTime(clone.summaryDate) } - { (clone.botType === 'Trader' && isDefined(clone.assetA) ) && + { (clone.botType === 'Trading' && isDefined(clone.assetA) ) && {clone.buyAverage} {clone.sellAverage} diff --git a/server/src/enums/BotTypes.js b/server/src/enums/BotTypes.js index 8616c540b..5c716da7d 100644 --- a/server/src/enums/BotTypes.js +++ b/server/src/enums/BotTypes.js @@ -1,9 +1,9 @@ -export const Trader = 'Trading' +export const Trading = 'Trading' export const Indicator = 'Indicator' export const Sensor = 'Extraction' export const BotTypesEnum = [ - Trader, + Trading, Indicator, Sensor ] diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js index 8b40b3305..cc05966f9 100644 --- a/server/src/kubernetes/createClone.js +++ b/server/src/kubernetes/createClone.js @@ -4,7 +4,7 @@ import { KubernateError } from '../errors' import { Client, config } from 'kubernetes-client' import deploymentManifest from '../config/clone-deployment.json' import { BACKTEST, COMPETITION, LIVE, NO_TIME } from '../enums/CloneMode' -import { Trader, Indicator, Sensor } from '../enums/BotTypes' +import { Trading, Indicator, Sensor } from '../enums/BotTypes' const createClone = async (clone) => { try { @@ -82,7 +82,7 @@ const createClone = async (clone) => { }) logger.debug('createClone Trading Configuration.') - if (clone.botType === Trader) { + if (clone.botType === Trading) { env.push({ 'name': 'RESUME_EXECUTION', 'value': clone.resumeExecution.toString()