From fbe20ac2bf52554cd9f7074b6e58fb6bf58b32a6 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Tue, 20 Mar 2018 11:30:09 -0700 Subject: [PATCH 1/2] Run yarn silently during make ember-dist --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 51a27f9dc..5c2266d9a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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 From 725f6b917b6c276c2d6f26cb69c38c72f41b10fe Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Tue, 20 Mar 2018 11:35:31 -0700 Subject: [PATCH 2/2] Deployments should only be watched when the job type supports deployments --- ui/app/routes/jobs/job/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/app/routes/jobs/job/index.js b/ui/app/routes/jobs/job/index.js index 6f0b17858..570b6fb3c 100644 --- a/ui/app/routes/jobs/job/index.js +++ b/ui/app/routes/jobs/job/index.js @@ -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), }); },