Unverified Commit 90d1bd26 authored by Michael Lange's avatar Michael Lange Committed by GitHub
Browse files

Merge pull request #4012 from hashicorp/b-ui-extraneous-deployment-watcher

UI: Extraneous deployment watcher
parents 5adf8d8a 725f6b91
Showing with 5 additions and 2 deletions
+5 -2
......@@ -292,7 +292,7 @@ test-ui: ## Run Nomad UI test suite
.PHONY: ember-dist
ember-dist: ## Build the static UI assets from source
@echo "--> Installing JavaScript assets"
@cd ui && yarn install
@cd ui && yarn install --silent
@cd ui && npm rebuild node-sass
@echo "--> Building Ember application"
@cd ui && npm run build
......
......@@ -5,11 +5,14 @@ import WithWatchers from 'nomad-ui/mixins/with-watchers';
export default Route.extend(WithWatchers, {
startWatchers(controller, model) {
if (!model) {
return;
}
controller.set('watchers', {
model: this.get('watch').perform(model),
summary: this.get('watchSummary').perform(model),
evaluations: this.get('watchEvaluations').perform(model),
deployments: this.get('watchDeployments').perform(model),
deployments: model.get('supportsDeployments') && this.get('watchDeployments').perform(model),
});
},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment