From 8889f8563b864c8ade959dbe6bb620d539ccb1d4 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Tue, 22 May 2018 18:00:02 -0700 Subject: [PATCH] fixed frozen build logs on web dashboard --- app-backend/dist/js/dashboard.min.js | 4 ++-- app-backend/src/docker/DockerApi.js | 2 ++ app-frontend/src/js/controllers/app-details-ctrl.js | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app-backend/dist/js/dashboard.min.js b/app-backend/dist/js/dashboard.min.js index 14b36d4..1479875 100644 --- a/app-backend/dist/js/dashboard.min.js +++ b/app-backend/dist/js/dashboard.min.js @@ -887,9 +887,9 @@ function AppDetailsCtrl($scope, } var logInfo = data.data; - $scope.isAppBuilding = logInfo.isAppBuilding; + app.isAppBuilding = logInfo.isAppBuilding; - if ($scope.isAppBuilding) { + if (app.isAppBuilding) { // forcefully expanding the view such that when building finishes it doesn't collapses automatically app.expandedLogs = true; } diff --git a/app-backend/src/docker/DockerApi.js b/app-backend/src/docker/DockerApi.js index 5e2fb81..88fc10b 100644 --- a/app-backend/src/docker/DockerApi.js +++ b/app-backend/src/docker/DockerApi.js @@ -543,9 +543,11 @@ class DockerApi { stream.on('end', function () { if (errorMessage) { + buildLogs.log('Push failed...'); reject(errorMessage); return; } + buildLogs.log('Push succeeded...'); resolve(); }); diff --git a/app-frontend/src/js/controllers/app-details-ctrl.js b/app-frontend/src/js/controllers/app-details-ctrl.js index dd6aed8..7d23eff 100644 --- a/app-frontend/src/js/controllers/app-details-ctrl.js +++ b/app-frontend/src/js/controllers/app-details-ctrl.js @@ -62,9 +62,9 @@ function AppDetailsCtrl($scope, } var logInfo = data.data; - $scope.isAppBuilding = logInfo.isAppBuilding; + app.isAppBuilding = logInfo.isAppBuilding; - if ($scope.isAppBuilding) { + if (app.isAppBuilding) { // forcefully expanding the view such that when building finishes it doesn't collapses automatically app.expandedLogs = true; }