diff --git a/dashboard/src/views/app.js b/dashboard/src/views/app.js index ba2541762..32b5a787e 100644 --- a/dashboard/src/views/app.js +++ b/dashboard/src/views/app.js @@ -175,8 +175,11 @@ angular.module('Application').controller('AppController', ['$scope', '$location' $scope.info.notes.content = $scope.app.notes; $scope.info.notes.editing = false; - console.log('--', $scope.app) $scope.info.checklist = $scope.app.checklist; + }, + + checklistAck: function () { + } }; diff --git a/src/apptask.js b/src/apptask.js index aa12ea1ec..dfd23d62d 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -318,6 +318,9 @@ async function install(app, args, progressCallback) { await progressCallback({ percent: 20, message: 'Downloading icon' }); await downloadIcon(app); + await progressCallback({ percent: 25, message: 'Updating checklist' }); + await updateChecklist(app, app.manifest.checklist || {}); + if (!skipDnsSetup) { await progressCallback({ percent: 30, message: 'Registering subdomains' }); @@ -374,8 +377,6 @@ async function install(app, args, progressCallback) { await progressCallback({ percent: 95, message: 'Configuring reverse proxy' }); await reverseProxy.configureApp(app, AuditSource.APPTASK); - await updateChecklist(app, app.manifest.checklist); - await progressCallback({ percent: 100, message: 'Done' }); await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } @@ -607,6 +608,9 @@ async function update(app, args, progressCallback) { } } + await progressCallback({ percent: 20, message: 'Updating checklist' }); + await updateChecklist(app, app.manifest.checklist || {}); + // download new image before app is stopped. this is so we can reduce downtime // and also not remove the 'common' layers when the old image is deleted await progressCallback({ percent: 25, message: 'Downloading image' }); @@ -655,8 +659,6 @@ async function update(app, args, progressCallback) { await reverseProxy.configureApp(app, AuditSource.APPTASK); } - await updateChecklist(app, updateConfig.manifest.checklist || {}); - await progressCallback({ percent: 100, message: 'Done' }); await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null, updateTime: new Date() }); }