Merge ca40b52 into 8a8e264

Azure · Oct 3, 2018 · ae656b0 · ae656b0
2 parents 8a8e264 + ca40b52
commit ae656b0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/...app/site/deployment-center/provider-dashboards/kudu-dashboard/kudu-dashboard.component.ts b/...app/site/deployment-center/provider-dashboards/kudu-dashboard/kudu-dashboard.component.ts
@@ -184,7 +184,15 @@ export class KuduDashboardComponent implements OnChanges, OnDestroy {
         });
         const newHash = this._getTableHash(tableItems);
         if (this._oldTableHash !== newHash) {
-            this._tableItems = tableItems;
+            this._tableItems = tableItems.sort((a, b) => {
+                if (a.time < b.time) {
+                    return -1;
+                }
+                if (a.time > b.time) {
+                    return 1;
+                }
+                return 0;
+            });
             this._oldTableHash = newHash;
         }
     }
@@ -271,7 +279,7 @@ export class KuduDashboardComponent implements OnChanges, OnDestroy {
                     return Observable.of(false);
                 });
         })
-        .subscribe();
+            .subscribe();
     }
 
     disconnect() {

diff --git a/...c/app/site/deployment-center/provider-dashboards/vso-Dashboard/vso-dashboard.component.ts b/...c/app/site/deployment-center/provider-dashboards/vso-Dashboard/vso-dashboard.component.ts
@@ -66,13 +66,21 @@ export class VsoDashboardComponent implements OnChanges, OnDestroy {
                     deployments: r.deployments,
                     VSOData: null,
                 };
-                this._tableItems = [];
+                const tableItems = [];
                 this.deploymentObject.deployments.value.forEach(element => {
                     const tableItem: ActivityDetailsLog = this._populateActivityDetails(element.properties);
                     tableItem.type = 'row';
-                    this._tableItems.push(tableItem);
+                    tableItems.push(tableItem);
+                });
+                this._tableItems = tableItems.sort((a, b) => {
+                    if (a.time < b.time) {
+                        return -1;
+                    }
+                    if (a.time > b.time) {
+                        return 1;
+                    }
+                    return 0;
                 });
-
                 const vstsMetaData: any = this.deploymentObject.siteMetadata.properties;
 
                 const endpoint = vstsMetaData['VSTSRM_ConfiguredCDEndPoint'];