feat: more tables by org type

Author: mshanemc

messages/list.md

@@ -58,7 +58,7 @@ Use one of the "org login" commands or "org create scratch" to add or create a s
 
 # noResultsFound
 
-No non-scratch orgs found.
+No %s found.
 
 # cleanWarning
 

src/commands/org/list.ts

@@ -16,9 +16,16 @@ Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'list');
 
 export type OrgListResult = {
+  /**
+   * @deprecated
+   * preserved for backward json compatibility.  Duplicates devHubs, sandboxes, regularOrgs, which should be preferred*/
   nonScratchOrgs: ExtendedAuthFields[];
   scratchOrgs: FullyPopulatedScratchOrgFields[];
+  sandboxes: ExtendedAuthFields[];
+  regularOrgs: ExtendedAuthFields[];
+  devHubs: ExtendedAuthFields[];
 };
+
 export class OrgListCommand extends SfCommand<OrgListResult> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly examples = messages.getMessages('examples');
@@ -56,6 +63,9 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
     this.flags = flags;
     const metaConfigs = await OrgListUtil.readLocallyValidatedMetaConfigsGroupedByOrgType(fileNames, flags);
     const groupedSortedOrgs = {
+      devHubs: metaConfigs.devHubs.map(decorateWithDefaultStatus).sort(comparator),
+      regularOrgs: metaConfigs.regularOrgs.map(decorateWithDefaultStatus).sort(comparator),
+      sandboxes: metaConfigs.sandboxes.map(decorateWithDefaultStatus).sort(comparator),
       nonScratchOrgs: metaConfigs.nonScratchOrgs.map(decorateWithDefaultStatus).sort(comparator),
       scratchOrgs: metaConfigs.scratchOrgs.map(decorateWithDefaultStatus).sort(comparator),
       expiredScratchOrgs: metaConfigs.scratchOrgs.filter((org) => !identifyActiveOrgByStatus(org)),
@@ -70,13 +80,19 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
     }
 
     const result = {
+      regularOrgs: groupedSortedOrgs.regularOrgs,
+      sandboxes: groupedSortedOrgs.sandboxes,
       nonScratchOrgs: groupedSortedOrgs.nonScratchOrgs,
+      devHubs: groupedSortedOrgs.devHubs,
       scratchOrgs: flags.all
         ? groupedSortedOrgs.scratchOrgs
         : groupedSortedOrgs.scratchOrgs.filter(identifyActiveOrgByStatus),
     };
 
-    this.printOrgTable(result.nonScratchOrgs, flags['skip-connection-status']);
+    // this.printOrgTable(result.nonScratchOrgs, flags['skip-connection-status']);
+    this.printOrgTable(result.devHubs, flags['skip-connection-status'], 'DevHubs');
+    this.printOrgTable(result.regularOrgs, flags['skip-connection-status'], 'Orgs');
+    this.printOrgTable(result.sandboxes, flags['skip-connection-status'], 'Sandboxes');
 
     this.printScratchOrgTable(result.scratchOrgs);
 
@@ -112,10 +128,11 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
     );
   }
 
-  protected printOrgTable(nonScratchOrgs: ExtendedAuthFields[], skipconnectionstatus: boolean): void {
+  protected printOrgTable(nonScratchOrgs: ExtendedAuthFields[], skipconnectionstatus: boolean, title: string): void {
     if (!nonScratchOrgs.length) {
-      this.log(messages.getMessage('noResultsFound'));
+      this.info(messages.getMessage('noResultsFound', [title]));
     } else {
+      this.info(title);
       const rows = nonScratchOrgs
         .map((row) => getStyledObject(row))
         .map((org) =>
@@ -126,32 +143,28 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
           )
         );
 
-      this.table(
-        rows,
-        {
-          defaultMarker: {
-            header: '',
-            get: (data): string => data.defaultMarker ?? '',
-          },
-          alias: {
-            header: 'ALIAS',
-            get: (data): string => data.alias ?? '',
-          },
-          username: { header: 'USERNAME' },
-          orgId: { header: 'ORG ID' },
-          ...(!skipconnectionstatus ? { connectedStatus: { header: 'CONNECTED STATUS' } } : {}),
+      this.table(rows, {
+        defaultMarker: {
+          header: '',
+          get: (data): string => data.defaultMarker ?? '',
         },
-        {
-          title: 'Non-scratch orgs',
-        }
-      );
+        alias: {
+          header: 'ALIAS',
+          get: (data): string => data.alias ?? '',
+        },
+        username: { header: 'USERNAME' },
+        orgId: { header: 'ORG ID' },
+        ...(!skipconnectionstatus ? { connectedStatus: { header: 'CONNECTED STATUS' } } : {}),
+      });
     }
+    this.log();
   }
 
   private printScratchOrgTable(scratchOrgs: FullyPopulatedScratchOrgFields[]): void {
     if (scratchOrgs.length === 0) {
-      this.log(messages.getMessage('noActiveScratchOrgs'));
+      this.info(messages.getMessage('noActiveScratchOrgs'));
     } else {
+      this.info(this.flags.all ? 'Scratch Orgs' : 'Active Scratch Orgs (use --all to see all)');
       // One or more rows are available.
       // we only need a few of the props for our table.  Oclif table doesn't like extra props non-string props.
       const rows = scratchOrgs
@@ -195,12 +208,13 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
               }
             : {}),
           expirationDate: { header: 'EXPIRATION DATE' },
-        },
-        {
-          title: 'Scratch orgs',
         }
+        // {
+        //   title: 'Scratch orgs',
+        // }
       );
     }
+    this.log();
   }
 }
 

src/shared/orgListUtil.ts

@@ -38,6 +38,9 @@ type OrgGroups = {
 type OrgGroupsFullyPopulated = {
   nonScratchOrgs: ExtendedAuthFields[];
   scratchOrgs: FullyPopulatedScratchOrgFields[];
+  regularOrgs: ExtendedAuthFields[];
+  sandboxes: ExtendedAuthFields[];
+  devHubs: ExtendedAuthFields[];
 };
 
 type ExtendedScratchOrgInfo = Record &
@@ -93,6 +96,9 @@ export class OrgListUtil {
     return {
       nonScratchOrgs,
       scratchOrgs,
+      sandboxes: nonScratchOrgs.filter(sandboxFilter),
+      regularOrgs: nonScratchOrgs.filter(regularOrgFilter),
+      devHubs: nonScratchOrgs.filter(devHubFilter),
     };
   }
 
@@ -367,3 +373,7 @@ const removeRestrictedInfoFromConfig = (
   config: AuthFieldsFromFS,
   properties: string[] = ['refreshToken', 'clientSecret']
 ): AuthFieldsFromFS => omit<Omit<AuthFieldsFromFS, 'refreshToken' | 'clientSecret'>>(config, properties);
+
+const sandboxFilter = (org: AuthFieldsFromFS): boolean => Boolean(org.isSandbox);
+const regularOrgFilter = (org: AuthFieldsFromFS): boolean => !org.isSandbox && !org.isDevHub;
+const devHubFilter = (org: AuthFieldsFromFS): boolean => Boolean(org.isDevHub);