Updated Deploy client to use new response structure.

Author: anierzad

PolyDeploy/Clients/Core/src/js/services/SessionDataService.js

@@ -16,7 +16,7 @@
 
                     // Parse if we need to.
                     if (data.Response) {
-                        data.Response = JSON.parse(data.Response);
+                        data.Response = parseSessionResponse(data.Response);
                     } else {
                         data.Response = undefined;
                     }
@@ -38,7 +38,7 @@
 
                     // Parse if we need to.
                     if (data.Response) {
-                        data.Response = JSON.parse(data.Response);
+                        data.Response = parseSessionResponse(data.Response);
                     } else {
                         data.Response = undefined;
                     }
@@ -107,6 +107,28 @@
             $http.get(controllerUrl + 'Install?guid=' + guid);
         }
 
+        function parseSessionResponse(rawResponse) {
+
+            // Parse to json.
+            var response = JSON.parse(rawResponse);
+
+            var newResponse = [];
+
+            // Tidy the response to make it easier to deal with.
+            for (var key in response) {
+
+                var modulePackage = response[key];
+
+                modulePackage.Order = parseInt(key);
+
+                newResponse.push(modulePackage);
+            }
+
+            console.log(newResponse);
+
+            return newResponse;
+        }
+
         return {
             create: create,
             get: get,

PolyDeploy/Clients/Deploy/src/js/controllers/ResultController.js

@@ -32,8 +32,18 @@
             var response = session.Response;
 
             // Get counts.
-            var installed = response.Installed.length;
-            var failed = response.Failed.length;
+            var installed = 0;
+            var failed = 0;
+
+            response.forEach(function (modPackage) {
+
+                // Attempted install?
+                if (modPackage.Attempted) {
+
+                    // Success?
+                    modPackage.Success ? installed++ : failed++;
+                }
+            });
 
             // Create start of string.
             var installStatus = 'Installation ';
@@ -57,4 +67,22 @@
             return installStatus;
         };
 
+        // Get CSS class to apply to module panel.
+        $scope.panelStatus = function (modPackage) {
+
+            // Default class.
+            var panelClass = 'panel-default';
+
+            // Attempted install?
+            if (modPackage.Attempted) {
+
+                // Success?
+                panelClass = modPackage.Success ? 'panel-success' : 'panel-danger';
+            }
+
+            console.log(panelClass);
+
+            return panelClass;
+        };
+
     }];

PolyDeploy/Clients/Deploy/src/js/templates/result.html

@@ -21,59 +21,36 @@ <h4>{{ currentStatus(session) }}</h4>
 
             <div class="row">
 
-                <!-- Installed -->
-                <div class="col-xs-12 col-md-6">
-                    <div class="panel panel-success">
+                <!-- Packages -->
+                <div ng-repeat="packageZip in session.Response" class="col-xs-12 col-md-6">
+                    <div class="panel" ng-class="panelStatus(packageZip)">
                         <div class="panel-heading">
-                            <h4 class="panel-title">Installed</h4>
+                            <h4 class="panel-title">{{ packageZip.Name }}</h4>
                         </div>
                         <div class="panel-body">
-                            <div class="module-info" ng-repeat="module in session.Response.Installed">
-                                <h4>{{ module.Name }}</h4>
+                            <div class="module-info">
+
                                 <h5>Packages</h5>
-                                <div ng-repeat="package in module.Packages">
+                                <div ng-repeat="package in packageZip.Packages">
                                     <ul class="package-info">
                                         <li><strong>Name:</strong> {{ package.Name }}</li>
                                         <li><strong>Version:</strong> {{ package.VersionStr }}</li>
                                     </ul>
                                 </div>
-                                <hr />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- /Installed -->
 
-                <!-- Failures -->
-                <div class="col-xs-12 col-md-6">
-                    <div class="panel panel-danger">
-                        <div class="panel-heading">
-                            <h4 class="panel-title">Failures</h4>
-                        </div>
-                        <div class="panel-body">
-                            <div class="module-info" ng-repeat="module in session.Response.Failed">
-
-                                <h5>Packages</h5>
-                                <div ng-repeat="package in module.Packages">
-                                    <ul class="package-info">
-                                        <li><strong>Name:</strong> {{ package.Name }}</li>
-                                        <li><strong>Version:</strong> {{ package.VersionStr }}</li>
+                                <div ng-show="packageZip.Failures && packageZip.Failures.length > 0">
+                                    <h5>Failures</h5>
+                                    <ul>
+                                        <li ng-repeat="failure in packageZip.Failures">
+                                            {{ failure }}
+                                        </li>
                                     </ul>
                                 </div>
-
-                                <h5>Failures</h5>
-                                <ul>
-                                    <li ng-repeat="failure in module.Failures">
-                                        {{ failure }}
-                                    </li>
-                                </ul>
-                                <hr />
-
                             </div>
                         </div>
                     </div>
                 </div>
-                <!-- /Failures -->
+                <!-- /Packages -->
 
             </div>