Merge pull request #178 from seniorquico/watchify-update-deps

Added 'watch' script and updated JS dependencies
OrleansContrib · Aug 29, 2018 · c9e61b4 · c9e61b4
2 parents 6095943 + d01d03f
commit c9e61b4
Show file tree

Hide file tree

Showing 8 changed files with 3,019 additions and 2,816 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 *.sln.docstates
 .vscode/
 BenchmarkDotNet.Artifacts/
+TestHost/index.min.js
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

diff --git a/App/.babelrc b/App/.babelrc
@@ -1,3 +1,8 @@
 {
-  "presets": ["react", "es2015"]
+  "presets": [
+    ["@babel/preset-env", {
+      "modules": false
+    }],
+    "@babel/preset-react"
+  ]
 }
diff --git a/App/.eslintrc.json b/App/.eslintrc.json
@@ -5,8 +5,8 @@
     },
     "extends": "eslint:recommended",
     "parserOptions": {
+        "ecmaVersion": 2018,
         "ecmaFeatures": {
-            "experimentalObjectRestSpread": true,
             "jsx": true
         }
     },

diff --git a/App/grains/grain.jsx b/App/grains/grain.jsx
@@ -83,11 +83,8 @@ module.exports = React.createClass({
     },
 
     render:function(){
-        var renderMethod = this.renderGraphs;
-
-        if (Object.keys(this.props.grainStats).length === 0) renderMethod = this.renderEmpty;
-
-        return renderMethod()
+        if (Object.keys(this.props.grainStats).length === 0) return this.renderEmpty();
+        return this.renderGraphs()
     }
 });
 

diff --git a/App/index.jsx b/App/index.jsx
@@ -18,7 +18,6 @@ const Alert = require('./components/alert.jsx');
 const LogStream = require('./logstream/log-stream.jsx');
 const SiloCounters = require('./silos/silo-counters.jsx');
 const Reminders = require('./reminders/reminders.jsx');
-var timer;
 
 var dashboardCounters = {};
 var routeIndex = 0;
@@ -213,7 +212,7 @@ routie('/host/:host/counters', function(host){
     renderLoading();
 
     http.get(`SiloCounters/${host}`, (err, data) => {
-
+        if (routeIndex != thisRouteIndex) return;
         var subTitle = <a href={`#/host/${host}`}>Silo Details</a>
         renderPage(<Page title={`Silo ${host}`} subTitle={subTitle}><SiloCounters silo={host} dashboardCounters={dashboardCounters} counters={data}/></Page>, "#/silos")
     });