6 files changed, 46 insertions, 10 deletions

diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index 47ac94c19..d469853a5 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -22,3 +22,7 @@ export const prepareAuthRequest = (options, auth = true) => {
 
   return request;
 };
+
+export const sendAuthRequest = (url, options) => (
+  window.fetch(url, prepareAuthRequest(options))
+);
diff --git a/src/features/workspaces/actions.js b/src/features/workspaces/actions.js
index 390af0696..83d3447c3 100644
--- a/src/features/workspaces/actions.js
+++ b/src/features/workspaces/actions.js
@@ -8,4 +8,7 @@ export default {
   create: {
     name: PropTypes.string.isRequired,
   },
+  delete: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
 };
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 65108a077..fabc12455 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -1,21 +1,27 @@
-import { prepareAuthRequest } from '../../api/utils/auth';
+import { sendAuthRequest } from '../../api/utils/auth';
 import { API, API_VERSION } from '../../environment';
 
 export default {
   getUserWorkspaces: async () => {
     const url = `${API}/${API_VERSION}/workspace`;
-    const request = await window.fetch(url, prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(url, { method: 'GET' });
     if (!request.ok) throw request;
     return request.json();
   },
+
   createWorkspace: async (name) => {
     const url = `${API}/${API_VERSION}/workspace`;
-    const request = await window.fetch(url, prepareAuthRequest({
+    const request = await sendAuthRequest(url, {
       method: 'POST',
       body: JSON.stringify({ name }),
-    }));
+    });
+    if (!request.ok) throw request;
+    return request.json();
+  },
+
+  deleteWorkspace: async (workspace) => {
+    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const request = await sendAuthRequest(url, { method: 'DELETE' });
     if (!request.ok) throw request;
     return request.json();
   },
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index ed54b194e..87b6062fb 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -5,15 +5,27 @@ import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { gaPage } from '../../../lib/analytics';
 import { state } from '../state';
 import EditWorkspaceForm from '../components/EditWorkspaceForm';
+import PropTypes from 'prop-types';
 
 @inject('stores', 'actions') @observer
 class EditWorkspaceScreen extends Component {
+  static propTypes = {
+    actions: PropTypes.shape({
+      workspace: PropTypes.shape({
+        delete: PropTypes.func.isRequired,
+      }),
+    }).isRequired,
+  };
+
   componentDidMount() {
     gaPage('Settings/Workspace/Edit');
   }
 
   onDelete = () => {
-    console.log('delete workspace');
+    const { workspaceBeingEdited } = state;
+    const { actions } = this.props;
+    if (!workspaceBeingEdited) return null;
+    actions.workspace.delete({ workspace: workspaceBeingEdited });
   };
 
   onSave = (values) => {
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index eb3287952..a3876a01a 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -21,14 +21,14 @@ class WorkspacesScreen extends Component {
   }
 
   render() {
-    const { workspace } = this.props.actions;
+    const { actions } = this.props;
     return (
       <ErrorBoundary>
         <WorkspacesDashboard
           workspaces={state.workspaces}
           isLoading={state.isLoading}
-          onCreateWorkspaceSubmit={data => workspace.create(data)}
-          onWorkspaceClick={w => workspace.edit({ workspace: w })}
+          onCreateWorkspaceSubmit={data => actions.workspace.create(data)}
+          onWorkspaceClick={w => actions.workspace.edit({ workspace: w })}
         />
       </ErrorBoundary>
     );
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index d90f9caac..a9b93f904 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -50,6 +50,7 @@ export default class WorkspacesStore extends Store {
 
     this.actions.workspace.edit.listen(this._edit);
     this.actions.workspace.create.listen(this._create);
+    this.actions.workspace.delete.listen(this._delete);
   }
 
   _setWorkspaces = (workspaces) => {
@@ -77,4 +78,14 @@ export default class WorkspacesStore extends Store {
       throw error;
     }
   };
+
+  _delete = async ({ workspace }) => {
+    try {
+      await this.api.deleteWorkspace(workspace);
+      this.state.workspaces.remove(workspace);
+      this.stores.router.push('/settings/workspaces');
+    } catch (error) {
+      throw error;
+    }
+  };
 }