Skip to content

Commit 0b739ed

Browse files
committed
Web ui improvements with filters, cluster health view and collapseable blocks
1 parent 584d8ed commit 0b739ed

30 files changed

+1371
-344
lines changed

reaper_ui/app/index.js

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import jQuery from "jquery";
2+
import ReactDOM from "react-dom";
23
import React from "react";
34
import ServerStatus from "jsx/server-status";
4-
import ClusterForm from "jsx/cluster-form";
5-
import ClusterList from "jsx/cluster-list";
6-
import Sidebar from "jsx/sidebar";
5+
import ClusterScreen from "jsx/cluster-screen";
76
import {
87
statusObservableTimer,
98
addClusterSubject, addClusterResult, deleteClusterSubject, deleteClusterResult,
@@ -12,27 +11,24 @@ import {
1211

1312
jQuery(document).ready(function($){
1413

15-
React.render(
16-
React.createElement(ServerStatus, {statusObservableTimer}),
17-
document.getElementById('cr-server-status')
18-
);
19-
20-
React.render(
21-
React.createElement(Sidebar, {clusterNames}),
22-
document.getElementById('cr-sidebar')
23-
);
14+
$.urlParam = function(name){
15+
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
16+
if (results != null) {
17+
return results[1] || 0;
18+
}
19+
else {
20+
return null;
21+
}
22+
}
2423

25-
React.render(
26-
React.createElement(ClusterForm, {addClusterSubject, addClusterResult}),
27-
document.getElementById('cr-cluster-form')
28-
);
24+
let currentCluster: string = $.urlParam('currentCluster');
25+
if(!currentCluster) {
26+
currentCluster = 'all';
27+
}
2928

30-
React.render(
31-
React.createElement(ClusterList, {
32-
clusterNames,
33-
deleteSubject: deleteClusterSubject,
34-
deleteResult: deleteClusterResult
35-
}),
36-
document.getElementById('cr-cluster-list')
29+
ReactDOM.render(
30+
React.createElement(ClusterScreen, {clusterNames, addClusterSubject, addClusterResult, currentCluster, deleteSubject: deleteClusterSubject,
31+
deleteResult: deleteClusterResult, statusObservableTimer}),
32+
document.getElementById('wrapper')
3733
);
3834
});

0 commit comments

Comments
 (0)