Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added 'watch' script and updated JS dependencies #178

Merged
merged 4 commits into from
Aug 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*.sln.docstates
.vscode/
BenchmarkDotNet.Artifacts/
TestHost/index.min.js

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
Expand Down
7 changes: 6 additions & 1 deletion App/.babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"presets": ["react", "es2015"]
"presets": [
["@babel/preset-env", {
"modules": false
}],
"@babel/preset-react"
]
}
2 changes: 1 addition & 1 deletion App/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
},
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 2018,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
}
},
Expand Down
7 changes: 2 additions & 5 deletions App/grains/grain.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
});

Expand Down
3 changes: 1 addition & 2 deletions App/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
});
Expand Down
Loading