SXT-143 Change render order and render in column

Signed-off-by: Mikeala Sheldt <mikaela@blockchaintp.com>
blockchaintp · Sep 25, 2019 · db249f8 · db249f8
1 parent 7af7de4
commit db249f8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/src/components/form/fields/Radio.js b/src/components/form/fields/Radio.js
@@ -56,11 +56,11 @@ class RadioField extends React.Component {
                   key={ i }
                   label={ option.title }
                   control={
-                    <Radio 
+                    <Radio
                       checked={ option.value.toString() === value.toString() }
                       value={ option.value }
                       disabled={ disabled }
-                      { ...extraProps } 
+                      { ...extraProps }
                     />
                   }
                 />
@@ -78,4 +78,4 @@ class RadioField extends React.Component {
   }
 }
 
-export default withStyles(styles)(RadioField)
+export default withStyles(styles)(RadioField)
diff --git a/src/components/form/fields/Text.js b/src/components/form/fields/Text.js
@@ -31,7 +31,7 @@ class Text extends React.Component {
         fullWidth
         id={ name }
         name={ name }
-        label={ item.title || item.id }
+        label={item.title || item.id}
         helperText={ touched && error ? error : item.helperText }
         error={ touched && Boolean(error) }
         value={ value || '' }
@@ -46,4 +46,4 @@ class Text extends React.Component {
   }
 }
 
-export default Text
+export default Text
diff --git a/src/pages/deployment/DeploymentForm.js b/src/pages/deployment/DeploymentForm.js
@@ -109,12 +109,26 @@ class DeploymentForm extends React.Component {
       tasks,
       exists,
     } = this.props
-    console.log("SCHEMA", schema);
 
     return (
       <div className={ classes.root }>
         <Grid container spacing={24}>
-          <Grid item xs={ id == 'new' ? 12 : 6 }>
+        {
+          id != 'new' && (
+            <Grid item xs={ 12 }>
+              <div>
+                {
+                  this.getRoleTable()
+                }
+                <div className={ classes.spacer } />
+                {
+                  this.getTaskTable()
+                }
+              </div>
+            </Grid>
+          )
+        }
+          <Grid item xs={ 12}>
             <Paper className={ classes.paper }>
               <Typography variant="h6" gutterBottom>
                 { title }
@@ -160,21 +174,7 @@ class DeploymentForm extends React.Component {
               />
             </Paper>
           </Grid>
-          {
-            id != 'new' && (
-              <Grid item xs={ 6 }>
-                <div>
-                  {
-                    this.getRoleTable()
-                  }
-                  <div className={ classes.spacer } />
-                  {
-                    this.getTaskTable()
-                  }
-                </div>
-              </Grid>
-            )
-          }
+
         </Grid>
       </div>
     )