3 files changed, 21 insertions, 5 deletions
diff --git a/app/client/dataset/dataset.actions.js b/app/client/dataset/dataset.actions.js
index 983d586..3fad75f 100644
--- a/app/client/dataset/dataset.actions.js
+++ b/app/client/dataset/dataset.actions.js
@@ -4,7 +4,7 @@ import types from '../types'
 import actions from '../actions'
 import { parser } from '../api'
 
-export const createOrUpdateFolder = (module, folder) => dispatch => {
+export const createOrUpdateFolder = (module, folder, name) => dispatch => {
   if (! folder || ! folder.id) {
     actions.folder.create({
       // username... should get added inside the API
diff --git a/app/client/dataset/dataset.component.js b/app/client/dataset/dataset.component.js
index f7ffbc5..c64a51f 100644
--- a/app/client/dataset/dataset.component.js
+++ b/app/client/dataset/dataset.component.js
@@ -23,6 +23,21 @@ class Dataset extends Component {
       fileOptions, pickFile, onPick
     } = this.props
     // sort files??
+    if (!folder.id) {
+      return (
+        <div className='dataset'>
+          <div className='params row'>
+            <div className='column'>
+              <Group title={title || 'Dataset'}>
+                {canRename
+                ? this.renderFolderNameInput(folder.name)
+                : <Param title='Dataset name'>{folder.name}</Param>}
+              </Group>
+            </div>
+          </div>
+        </div>
+      )
+    }
     return (
       <div className='dataset'>
         <div className='params row'>
@@ -50,12 +65,12 @@ class Dataset extends Component {
     )
   }
   curry(action) {
-    const { module, folder} = this.props
+    const { module, folder } = this.props
     return (param) => action(module, folder, param)
   }
   renderFolderNameInput(name){
     return <TextInput
-      title='Dataset name'
+      title={!this.props.folder.id ? 'Create a new dataset' : 'Dataset name'}
       value={name}
       onSave={this.curry(this.props.actions.dataset.createOrUpdateFolder)}
     />
diff --git a/app/server/bridge.js b/app/server/bridge.js
index beac55c..f6af00d 100644
--- a/app/server/bridge.js
+++ b/app/server/bridge.js
@@ -9,8 +9,9 @@ client.on('connect', bind_client)
 export const relay = (() => {
   let relay;
   if (process.env.EXPRESS_CONNECTS_TO_RELAY === 'true') {
-    console.log('Connecting to relay on ' + process.env.RELAY_REMOTE)
-    relay = require('socket.io-client').connect(process.env.RELAY_REMOTE)
+    const relay_endpoint = (process.env.SECURE_PROXY ? 'https' : 'http') + process.env.PROXY_REMOTE + '/client'
+    console.log('Connecting to relay on ' + relay_endpoint)
+    relay = require('socket.io-client').connect(relay_endpoint)
     proxy.attach(server)
     bind_relay(relay)
   } else {