2 files changed, 66 insertions, 4 deletions

diff --git a/src/containers/settings/EditWorkspaceScreen.js b/src/containers/settings/EditWorkspaceScreen.js
new file mode 100644
index 000000000..665b405bd
--- /dev/null
+++ b/src/containers/settings/EditWorkspaceScreen.js
@@ -0,0 +1,54 @@
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import Form from '../../lib/Form';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { gaPage } from '../../lib/analytics';
+import { state } from '../../features/workspaces/state';
+
+const messages = defineMessages({
+  name: {
+    id: 'settings.workspace.form.name',
+    defaultMessage: '!!!Name',
+  },
+});
+
+@inject('stores', 'actions') @observer
+class EditWorkspaceScreen extends Component {
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  componentDidMount() {
+    gaPage('Settings/Workspace/Edit');
+  }
+
+  prepareForm(workspace) {
+    const { intl } = this.context;
+    const config = {
+      fields: {
+        name: {
+          label: intl.formatMessage(messages.name),
+          placeholder: intl.formatMessage(messages.name),
+          value: workspace.name,
+        },
+      },
+    };
+    return new Form(config);
+  }
+
+  render() {
+    const { workspaceBeingEdited } = state;
+    if (!workspaceBeingEdited) return null;
+
+    // const form = this.prepareForm(workspaceBeingEdited);
+
+    return (
+      <ErrorBoundary>
+        <div>{workspaceBeingEdited.name}</div>
+      </ErrorBoundary>
+    );
+  }
+}
+
+export default EditWorkspaceScreen;
diff --git a/src/containers/settings/WorkspacesScreen.js b/src/containers/settings/WorkspacesScreen.js
index e767fdfbe..5e91f7673 100644
--- a/src/containers/settings/WorkspacesScreen.js
+++ b/src/containers/settings/WorkspacesScreen.js
@@ -1,25 +1,33 @@
 import React, { Component } from 'react';
-import { observer } from 'mobx-react';
+import { inject, observer } from 'mobx-react';
+import PropTypes from 'prop-types';
 import { gaPage } from '../../lib/analytics';
 import { state } from '../../features/workspaces/state';
-
 import WorkspacesDashboard from '../../components/settings/workspaces/WorkspacesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-@observer
+@inject('actions') @observer
 class WorkspacesScreen extends Component {
-  static propTypes = {};
+  static propTypes = {
+    actions: PropTypes.shape({
+      workspace: PropTypes.shape({
+        edit: PropTypes.func.isRequired,
+      }),
+    }).isRequired,
+  };
 
   componentDidMount() {
     gaPage('Settings/Workspaces Dashboard');
   }
 
   render() {
+    const { workspace } = this.props.actions;
     return (
       <ErrorBoundary>
         <WorkspacesDashboard
           workspaces={state.workspaces}
           isLoading={state.isLoading}
+          onWorkspaceClick={w => workspace.edit({ workspace: w })}
         />
       </ErrorBoundary>
     );