finish workspaces mvp

2 files changed, 22 insertions, 15 deletions

diff --git a/src/actions/index.js b/src/actions/index.js
index 45e6da515..00f843cd6 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -11,7 +11,7 @@ import payment from './payment';
 import news from './news';
 import settings from './settings';
 import requests from './requests';
-import workspace from '../features/workspaces/actions';
+import workspaces from '../features/workspaces/actions';
 
 const actions = Object.assign({}, {
   service,
@@ -24,7 +24,9 @@ const actions = Object.assign({}, {
   news,
   settings,
   requests,
-  workspace,
 });
 
-export default defineActions(actions, PropTypes.checkPropTypes);
+export default Object.assign(
+  defineActions(actions, PropTypes.checkPropTypes),
+  { workspaces },
+);
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js
index 499018d70..6571e9441 100644
--- a/src/actions/lib/actions.js
+++ b/src/actions/lib/actions.js
@@ -1,18 +1,23 @@
+export const createActionsFromDefinitions = (actionDefinitions, validate) => {
+  const actions = {};
+  Object.keys(actionDefinitions).forEach((actionName) => {
+    const action = (params) => {
+      const schema = actionDefinitions[actionName];
+      validate(schema, params, actionName);
+      action.notify(params);
+    };
+    actions[actionName] = action;
+    action.listeners = [];
+    action.listen = listener => action.listeners.push(listener);
+    action.notify = params => action.listeners.forEach(listener => listener(params));
+  });
+  return actions;
+};
+
 export default (definitions, validate) => {
   const newActions = {};
   Object.keys(definitions).forEach((scopeName) => {
-    newActions[scopeName] = {};
-    Object.keys(definitions[scopeName]).forEach((actionName) => {
-      const action = (params) => {
-        const schema = definitions[scopeName][actionName];
-        validate(schema, params, actionName);
-        action.notify(params);
-      };
-      newActions[scopeName][actionName] = action;
-      action.listeners = [];
-      action.listen = listener => action.listeners.push(listener);
-      action.notify = params => action.listeners.forEach(listener => listener(params));
-    });
+    newActions[scopeName] = createActionsFromDefinitions(definitions[scopeName], validate);
   });
   return newActions;
 };