Merge pull request #117 from thelastpickle/webui-improvements

Web UI improvements
thelastpickle · Jun 19, 2017 · 07887ee · 07887ee
2 parents ca07648 + 6e2055d
commit 07887ee
Show file tree

Hide file tree

Showing 30 changed files with 1,370 additions and 340 deletions.
diff --git a/reaper_ui/app/index.js b/reaper_ui/app/index.js
@@ -1,9 +1,8 @@
 import jQuery from "jquery";
+import ReactDOM from "react-dom";
 import React from "react";
 import ServerStatus from "jsx/server-status";
-import ClusterForm from "jsx/cluster-form";
-import ClusterList from "jsx/cluster-list";
-import Sidebar from "jsx/sidebar";
+import ClusterScreen from "jsx/cluster-screen";
 import {
   statusObservableTimer,
   addClusterSubject, addClusterResult, deleteClusterSubject, deleteClusterResult,
@@ -12,27 +11,24 @@ import {
 
 jQuery(document).ready(function($){
 
-  React.render(
-    React.createElement(ServerStatus, {statusObservableTimer}),
-    document.getElementById('cr-server-status')
-  );
-
-  React.render(
-    React.createElement(Sidebar, {clusterNames}),
-    document.getElementById('cr-sidebar')
-  );
+ $.urlParam = function(name){
+    var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+    if (results != null) {
+      return results[1] || 0;
+    } 
+    else {
+      return null;
+    }
+  }
 
-  React.render(
-    React.createElement(ClusterForm, {addClusterSubject, addClusterResult}),
-    document.getElementById('cr-cluster-form')
-  );
+  let currentCluster: string = $.urlParam('currentCluster');
+  if(!currentCluster) {
+    currentCluster = 'all';
+  } 
 
-  React.render(
-    React.createElement(ClusterList, {
-      clusterNames,
-      deleteSubject: deleteClusterSubject,
-      deleteResult: deleteClusterResult
-    }),
-    document.getElementById('cr-cluster-list')
+  ReactDOM.render(
+    React.createElement(ClusterScreen, {clusterNames, addClusterSubject, addClusterResult, currentCluster, deleteSubject: deleteClusterSubject,
+    deleteResult: deleteClusterResult, statusObservableTimer}),
+    document.getElementById('wrapper')
   );
 });