Missed some arguments.

2 files changed, 36 insertions, 34 deletions

diff --git a/synapse_topology/view/webui/js/components/UI.jsx b/synapse_topology/view/webui/js/components/UI.jsx
index 7d26a2c501..87c161be9a 100644
--- a/synapse_topology/view/webui/js/components/UI.jsx
+++ b/synapse_topology/view/webui/js/components/UI.jsx
@@ -48,37 +48,37 @@ const block_mapping = ui_block => {
   console.log(`fetching ${ui_block}`)
   switch (ui_block) {
     case LOADING_UI:
-      return <Loading />
+      return <Loading key={ui_block} />
     case ERROR_UI:
-      return <Error />
+      return <Error key={ui_block} />
     case SETUP_INTRO_UI:
-      return < IntroUi />
+      return < IntroUi key={ui_block} />
     case SERVER_NAME_UI:
-      return <ServerName />
+      return <ServerName key={ui_block} />
     case STATS_REPORT_UI:
-      return <StatsReporter />
+      return <StatsReporter key={ui_block} />
     case KEY_EXPORT_UI:
-      return <ExportKeys />
+      return <ExportKeys key={ui_block} />
     case DELEGATION_OPTIONS_UI:
-      return <DelegationOptions />
+      return <DelegationOptions key={ui_block} />
     case DELEGATION_SERVER_NAME_UI:
-      return <DelegationServerName />
+      return <DelegationServerName key={ui_block} />
     case DELEGATION_PORT_SELECTION_UI:
-      return <DelegationPortSelection />
+      return <DelegationPortSelection key={ui_block} />
     case REVERSE_PROXY_UI:
-      return <ReverseProxy />
+      return <ReverseProxy key={ui_block} />
     case TLS_UI:
-      return <TLS />
+      return <TLS key={ui_block} />
     case TLS_CERTPATH_UI:
-      return <TLSCertPath />
+      return <TLSCertPath key={ui_block} />
     case PORT_SELECTION_UI:
-      return <PortSelection />
+      return <PortSelection key={ui_block} />
     case REVERSE_PROXY_TEMPLATE_UI:
-      return <ReverseProxySampleConfig />
+      return <ReverseProxySampleConfig key={ui_block} />
     case DELEGATION_TEMPLATE_UI:
-      return <DelegationSampleConfig />
+      return <DelegationSampleConfig key={ui_block} />
     case DATABASE_UI:
-      return <Database />
+      return <Database key={ui_block} />
     default:
       return <h1>how did i get here?</h1>
   }
diff --git a/synapse_topology/view/webui/js/reducers/setup-ui-reducer.js b/synapse_topology/view/webui/js/reducers/setup-ui-reducer.js
index 16da37e01d..160e1680cc 100644
--- a/synapse_topology/view/webui/js/reducers/setup-ui-reducer.js
+++ b/synapse_topology/view/webui/js/reducers/setup-ui-reducer.js
@@ -36,33 +36,35 @@ export default ({ setup_ui, base_config }, action) => {
         active_blocks: [
           ...setup_ui.active_blocks,
           forward_mapping(
-            setup_ui.active_blocks[setup_ui.active_blocks.length - 1]
+            setup_ui.active_blocks[setup_ui.active_blocks.length - 1],
+            action,
+            base_config,
           ),
         ]
       }
 
     // TODO: Think about how back should work..
-    case BACK_UI:
-      switch (ui.active_ui) {
-        case STATS_REPORT_UI:
-          return SERVER_NAME_UI;
-        case KEY_EXPORT_UI:
-          return STATS_REPORT_UI;
-        case DELEGATION_OPTIONS_UI:
-          return KEY_EXPORT_UI;
-        case WELL_KNOWN_UI:
-          return DELEGATION_OPTIONS_UI;
-        case DNS_UI:
-          return WELL_KNOWN_UI;
-        default:
-          SETUP_INTRO_UI;
-      }
+    // case BACK_UI:
+    //   switch (ui.active_ui) {
+    //     case STATS_REPORT_UI:
+    //       return SERVER_NAME_UI;
+    //     case KEY_EXPORT_UI:
+    //       return STATS_REPORT_UI;
+    //     case DELEGATION_OPTIONS_UI:
+    //       return KEY_EXPORT_UI;
+    //     case WELL_KNOWN_UI:
+    //       return DELEGATION_OPTIONS_UI;
+    //     case DNS_UI:
+    //       return WELL_KNOWN_UI;
+    //     default:
+    //       SETUP_INTRO_UI;
+    //   }
     default:
-      return ui.active_ui;
+      return setup_ui;
   }
 }
 
-const forward_mapping = (current_ui, action) => {
+const forward_mapping = (current_ui, action, base_config) => {
   switch (current_ui) {
     case SETUP_INTRO_UI:
       return SERVER_NAME_UI;