From 8d9da719b416ecfb50c92d777179fc100260fe76 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 29 Jun 2016 14:20:21 +0200
Subject: [PATCH] add progress bar to install and uninstall

---
 .../src/views/packager/views/install-local.controller.js | 5 +++++
 .../src/views/packager/views/install-local.html          | 8 ++++++++
 .../src/views/packager/views/installed.controller.js     | 5 ++++-
 .../src/views/packager/views/installed.html              | 8 ++++++++
 .../src/views/packager/views/repo.controller.js          | 4 ++++
 .../src/views/packager/views/repo.html                   | 9 +++++++++
 6 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
index 9f5a37268f..d80a9eed35 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
@@ -96,27 +96,32 @@
 
         function installPackage() {
             vm.installState.status = "Installing";
+            vm.installState.progress = "0";
 
             //TODO: If any of these fail, will they keep calling the next one?
             packageResource
                 .installFiles(vm.localPackage)
                 .then(function(pack) {
                         vm.installState.status = "Importing...";
+                        vm.installState.progress = "25";
                         return packageResource.import(pack);
                     },
                     installError)
                 .then(function(pack) {
                         vm.installState.status = "Installing...";
+                        vm.installState.progress = "50";
                         return packageResource.installFiles(pack);
                     },
                     installError)
                 .then(function(pack) {
                         vm.installState.status = "Restarting, please wait...";
+                        vm.installState.progress = "75";
                         return packageResource.installData(pack);
                     },
                     installError)
                 .then(function(pack) {
                         vm.installState.status = "All done, your browser will now refresh";
+                        vm.installState.progress = "100";
                         return packageResource.cleanUp(pack);
                     },
                     installError)
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
index 8f9928bc5e..db6cad587b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
@@ -107,6 +107,14 @@
                                         Install package
                                 </button>
                             </div>
+
+                            <div class="umb-info-local-item">
+                                <umb-progress-bar
+                                    ng-if="vm.installState.status !== ''"
+                                    percentage="{{vm.installState.progress}}">
+                                </umb-progress-bar>
+                            </div>
+
                             <div class="umb-info-local-item text-error" ng-if="!vm.localPackage.isCompatible">
                                 This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}}
                             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
index e2b5fb4de8..b947caa4d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
@@ -29,16 +29,19 @@
 
         function uninstallPackage(installedPackage) {
             vm.installState.status = "Uninstalling package...";
+            vm.installState.progress = "0";
+
             packageResource.uninstall(installedPackage.id)
                 .then(function () {
                     if (installedPackage.files.length > 0) {
                         vm.installState.status = "All done, your browser will now refresh";
+                        vm.installState.progress = "100";
 
                         var url = window.location.href + "?uninstalled=" + vm.package.packageGuid;
                         window.location.reload(true);
                     }
                     else {
-                        init();                        
+                        init();
                     }
                 });
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
index 27110f0f28..cfd9647f49 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
@@ -99,6 +99,14 @@
                                 Uninstall package
                             </button>
                         </div>
+
+                        <div class="umb-info-local-item">
+                            <umb-progress-bar
+                                ng-if="vm.installState.status !== ''"
+                                percentage="{{vm.installState.progress}}">
+                            </umb-progress-bar>
+                        </div>
+
                         <div class="umb-info-local-item text-info">
                             <p>{{vm.installState.status}}</p>
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
index 081d8189c8..6aae118085 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
@@ -165,21 +165,25 @@
         function installPackage(selectedPackage) {
 
             vm.installState.status = "importing...";
+            vm.installState.progress = "0";
 
             packageResource
                 .import(selectedPackage)
                 .then(function(pack) {
                         vm.installState.status = "Installing...";
+                        vm.installState.progress = "33";
                         return packageResource.installFiles(pack);
                     },
                     error)
                 .then(function(pack) {
                         vm.installState.status = "Restarting, please wait...";
+                        vm.installState.progress = "66";
                         return packageResource.installData(pack);
                     },
                     error)
                 .then(function(pack) {
                         vm.installState.status = "All done, your browser will now refresh";
+                        vm.installState.progress = "100";
                         return packageResource.cleanUp(pack);
                     },
                     error)
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
index be2096b4ec..52594335d1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
@@ -317,9 +317,18 @@
                                     Install package
                                 </button>
                             </div>
+
+                            <div class="umb-info-local-item">
+                                <umb-progress-bar
+                                    ng-if="vm.installState.status !== ''"
+                                    percentage="{{vm.installState.progress}}">
+                                </umb-progress-bar>
+                            </div>
+
                             <div class="umb-info-local-item text-error" ng-if="!vm.localPackage.isCompatible">
                                 This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}}
                             </div>
+
                             <div class="umb-info-local-item text-info">
                                 <p>{{vm.installState.status}}</p>
                             </div>