From 8771349d101c296ee55a0d03b033124e56e2636f Mon Sep 17 00:00:00 2001
From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com>
Date: Wed, 30 Jan 2019 15:22:12 -0300
Subject: [PATCH 1/3] Displaying sections depending on bot state

---
 client/src/views/Clone/List/ListClones.js | 89 +++++++++++++----------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/client/src/views/Clone/List/ListClones.js b/client/src/views/Clone/List/ListClones.js
index 67535515a..165bc445e 100644
--- a/client/src/views/Clone/List/ListClones.js
+++ b/client/src/views/Clone/List/ListClones.js
@@ -32,6 +32,7 @@ class ListClones extends Component {
   render () {
     const { classes } = this.props
     const clone = this.props.currentClone
+    console.log(clone)
     return (
       <React.Fragment>
       <ExpansionPanel className={classes.root}>
@@ -83,48 +84,56 @@ class ListClones extends Component {
                 </div>
               </div>
             </div>
-            <div className={classNames(classes.column3, classes.helper)}>
-              <Typography className={classes.cloneInfoTitle}>Execution Information</Typography>
-              <div className={classes.details}>
-                <div className={classes.column4}>
-                  <Typography className={classes.cloneInfoBold}>Last Execution:</Typography>
-                  { (clone.botType === 'Trading' && isDefined(clone.assetA) ) &&
-                    <React.Fragment>
-                      <Typography className={classes.cloneInfoBold}>Buy Average:</Typography>
-                      <Typography className={classes.cloneInfoBold}>Sell Average:</Typography>
-                      <Typography className={classes.cloneInfoBold}>Market Rate:</Typography>
-                      <Typography className={classes.cloneInfoBold}>ROI {clone.assetA}:</Typography>
-                      <Typography className={classes.cloneInfoBold}>ROI {clone.assetB}:</Typography>
-                    </React.Fragment>
-                  }
+            { isDefined(clone.summaryDate) &&
+              <React.Fragment>
+                <div className={classNames(classes.column3, classes.helper)}>
+                  <Typography className={classes.cloneInfoTitle}>Execution Information</Typography>
+                  <div className={classes.details}>
+                    <div className={classes.column4}>
+                      <Typography className={classes.cloneInfoBold}>Last Execution:</Typography>
+                      { (clone.botType === 'TRADER' && isDefined(clone.assetA) ) &&
+                        <React.Fragment>
+                          <Typography className={classes.cloneInfoBold}>Buy Average:</Typography>
+                          <Typography className={classes.cloneInfoBold}>Sell Average:</Typography>
+                          <Typography className={classes.cloneInfoBold}>Market Rate:</Typography>
+                          <Typography className={classes.cloneInfoBold}>ROI {clone.assetA}:</Typography>
+                          <Typography className={classes.cloneInfoBold}>ROI {clone.assetB}:</Typography>
+                        </React.Fragment>
+                      }
+                    </div>
+                    <div className={classes.column4}>
+                      <Typography className={classes.cloneInfoNormal}>{ toLocalTime(clone.summaryDate) }</Typography>
+                      { (clone.botType === 'TRADER' && isDefined(clone.assetA) ) &&
+                        <React.Fragment>
+                          <Typography className={classes.cloneInfoNormal}>{clone.buyAverage}</Typography>
+                          <Typography className={classes.cloneInfoNormal}>{clone.sellAverage}</Typography>
+                          <Typography className={classes.cloneInfoNormal}>{clone.marketRate}</Typography>
+                          <Typography className={classes.cloneInfoNormal}>{clone.combinedProfitsA}</Typography>
+                          <Typography className={classes.cloneInfoNormal}>{clone.combinedProfitsB}</Typography>
+                        </React.Fragment>
+                      }
+                    </div>
+                  </div>
                 </div>
-                <div className={classes.column4}>
-                  <Typography className={classes.cloneInfoNormal}>{isDefined(clone.summaryDate) ? toLocalTime(clone.summaryDate): 'waiting update...'}</Typography>
-                  { ((clone.botType === 'Indicator' || clone.botType === 'Extraction') && isDefined(clone.assetA) ) &&
-                    <React.Fragment>
-                      <Typography className={classes.cloneInfoNormal}>{clone.buyAverage}</Typography>
-                      <Typography className={classes.cloneInfoNormal}>{clone.sellAverage}</Typography>
-                      <Typography className={classes.cloneInfoNormal}>{clone.marketRate}</Typography>
-                      <Typography className={classes.cloneInfoNormal}>{clone.combinedProfitsA}</Typography>
-                      <Typography className={classes.cloneInfoNormal}>{clone.combinedProfitsB}</Typography>
-                    </React.Fragment>
-                  }
+              </React.Fragment>
+            }
+            { (clone.state !== 'UNPUBLISHED') &&
+              <React.Fragment>
+                <div className={classNames(classes.column3, classes.helper)}>
+                  <Typography className={classes.cloneInfoTitle}>Virtual Machine Status</Typography>
+                  <TextField
+                    id="outlined-state"
+                    defaultValue={clone.state}
+                    margin="normal"
+                    InputProps={{
+                      readOnly: true,
+                    }}
+                    fullWidth
+                    multiline
+                  />
                 </div>
-              </div>
-            </div>
-            <div className={classNames(classes.column3, classes.helper)}>
-              <Typography className={classes.cloneInfoTitle}>Virtual Machine Status</Typography>
-              <TextField
-                id="outlined-state"
-                defaultValue={clone.state}
-                margin="normal"
-                InputProps={{
-                  readOnly: true,
-                }}
-                fullWidth
-                multiline
-              />
-            </div>
+            </React.Fragment>
+          }
         </ExpansionPanelDetails>
         {
           !this.props.isHistory &&

From cd8e34065b01f08a3b16a856b36401e243ab9fb8 Mon Sep 17 00:00:00 2001
From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com>
Date: Wed, 30 Jan 2019 15:22:53 -0300
Subject: [PATCH 2/3] Adding bot type on listing

---
 server/src/schema/cloneDetails.js          | 1 +
 server/src/schema/queries/HistoryClones.js | 1 +
 server/src/schema/queries/ListClones.js    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js
index 447c34ecc..040ce1a7d 100644
--- a/server/src/schema/cloneDetails.js
+++ b/server/src/schema/cloneDetails.js
@@ -9,6 +9,7 @@ const cloneDetails = async(authorization, botsByUser, clone) => {
   let selectedBot = getSelectedBot(botsByUser.data.data.teams_FbByTeamMember, clone.botId)
   clone.teamId = botsByUser.data.data.teams_FbByTeamMember.id
   clone.botId = selectedBot.id
+  clone.kind = selectedBot.kind
   clone.teamSlug = botsByUser.data.data.teams_FbByTeamMember.slug
   clone.botSlug = selectedBot.slug
   clone.cloneName = getJobNameFromClone(clone)
diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js
index 467548e27..a37557ae7 100644
--- a/server/src/schema/queries/HistoryClones.js
+++ b/server/src/schema/queries/HistoryClones.js
@@ -34,6 +34,7 @@ const resolve = async(parent, args, context) => {
 
    for (var i = 0; i < clones.length; i++) {
       clones[i] = await cloneDetails(context.authorization, botsByUser, clones[i])
+      clones[i].botType = clones[i].kind // Only for listing we show the teams value
    }
 
    return clones
diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js
index c3cc91a67..74e0868b4 100644
--- a/server/src/schema/queries/ListClones.js
+++ b/server/src/schema/queries/ListClones.js
@@ -39,6 +39,7 @@ const resolve = async(parent, args, context) => {
       clones[i].state = state.substring(1, state.length-1)
       let lastLogs = await getCloneLogs(clones[i].cloneName)
       clones[i].lastLogs = lastLogs.substring(1, lastLogs.length-1)
+      clones[i].botType = clones[i].kind // Only for listing we show the teams value
    }
    return clones
  } catch (err){

From 16183e58a4f035f88b296838b95826995a64d193 Mon Sep 17 00:00:00 2001
From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com>
Date: Wed, 30 Jan 2019 15:23:08 -0300
Subject: [PATCH 3/3] New version

---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index f010087e1..86b552ca7 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superalgos/operations-client",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Superalgos Operations client-side web app",
   "main": "src/index.js",
   "dependencies": {