Merge pull request #250 from Microsoft/app-deployment-names

use the fact that deployment names are now stored in the rest app object

Author: Richard Hua

cli/script/command-executor.ts

@@ -179,24 +179,8 @@ function appList(command: cli.IAppListCommand): Promise<void> {
     throwForInvalidOutputFormat(command.format);
     var apps: App[];
     return sdk.getApps()
-        .then((retrievedApps: App[]): Promise<string[][]> => {
-            apps = retrievedApps;
-            var deploymentListPromises: Promise<string[]>[] = apps.map((app: App) => {
-
-                return sdk.getDeployments(app.name)
-                    .then((deployments: Deployment[]) => {
-                        var deploymentList: string[] = deployments
-                            .map((deployment: Deployment) => deployment.name)
-                            .sort((first: string, second: string) => {
-                                return first.toLowerCase().localeCompare(second.toLowerCase());
-                            });
-                        return deploymentList;
-                    });
-            });
-            return Q.all(deploymentListPromises);
-        })
-        .then((deploymentLists: string[][]): void => {
-            printAppList(command.format, apps, deploymentLists);
+        .then((retrievedApps: App[]): void => {
+            printAppList(command.format, retrievedApps);
         });
 }
 
@@ -671,20 +655,14 @@ function formatDate(unixOffset: number): string {
     }
 }
 
-function printAppList(format: string, apps: App[], deploymentLists: string[][]): void {
+function printAppList(format: string, apps: App[]): void {
     if (format === "json") {
-        var dataSource: any[] = apps.map((app: App, index: number) => {
-            var augmentedApp: any = app;
-            augmentedApp.deployments = deploymentLists[index];
-            return augmentedApp;
-        });
-
-        printJson(dataSource);
+        printJson(apps);
     } else if (format === "table") {
         var headers = ["Name", "Deployments"];
         printTable(headers, (dataSource: any[]): void => {
             apps.forEach((app: App, index: number): void => {
-                var row = [app.name, wordwrap(50)(deploymentLists[index].join(", "))];
+                var row = [app.name, wordwrap(50)(app.deployments.join(", "))];
                 dataSource.push(row);
             });
         });

cli/test/cli.ts

@@ -94,10 +94,12 @@ export class SdkStub {
     public getApps(): Promise<codePush.App[]> {
         return Q([<codePush.App>{
             name: "a",
-            collaborators: { "a@a.com": { permission: "Owner", isCurrentAccount: true } }
+            collaborators: { "a@a.com": { permission: "Owner", isCurrentAccount: true } },
+            deployments: [ "Production", "Staging" ]
         }, <codePush.App>{
             name: "b",
-            collaborators: { "a@a.com": { permission: "Owner", isCurrentAccount: true } }
+            collaborators: { "a@a.com": { permission: "Owner", isCurrentAccount: true } },
+            deployments: [ "Production", "Staging" ]
         }]);
     }
 

definitions/rest-definitions.d.ts

@@ -115,6 +115,7 @@ declare module "rest-definitions" {
     export interface App {
         /*generated*/ collaborators?: CollaboratorMap;
         /*key*/ name: string;
+        /* generated */ deployments?: string[];
     }
 
     /*in*/