From cacb18d6f9629382a72e14645fc2c87f73fd37b5 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 2 Aug 2018 12:04:34 -0400 Subject: [PATCH] fix errors and add swarm --- embark-ui/src/containers/ProcessesContainer.js | 17 +++++++---------- lib/modules/swarm/index.js | 3 ++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/embark-ui/src/containers/ProcessesContainer.js b/embark-ui/src/containers/ProcessesContainer.js index 3f21cddd..c98bc026 100644 --- a/embark-ui/src/containers/ProcessesContainer.js +++ b/embark-ui/src/containers/ProcessesContainer.js @@ -20,24 +20,21 @@ class ProcessesContainer extends Component { return ; } - if (processes.error) { - return ( -

- Error loading processes: {processes.error.message || processes.error} -

- ); - } - const processNames = Object.keys(processes.data); return (
- + {processes.error &&

+ Error: {processes.error.message || processes.error} +

} + + {processNames && processNames.length && {processNames.map(processName => { return ( ); })} - +
} +
); } diff --git a/lib/modules/swarm/index.js b/lib/modules/swarm/index.js index 2e0df00e..449f9ba5 100644 --- a/lib/modules/swarm/index.js +++ b/lib/modules/swarm/index.js @@ -95,7 +95,8 @@ class Swarm { events: self.events, storageConfig: self.storageConfig, webServerConfig: self.webServerConfig, - blockchainConfig: self.blockchainConfig + blockchainConfig: self.blockchainConfig, + embark: self.embark }); self.logger.trace(`Storage module: Launching swarm process...`); return storageProcessesLauncher.launchProcess('swarm', callback);