pr edits

Author: mayakoneval

packages/apollo-language-server/src/engine/operations/listServices.ts

@@ -9,7 +9,6 @@ export const LIST_SERVICES = gql`
           services {
             graphID
             graphVariant
-            __typename
             name
             url
             updatedAt

packages/apollo/src/commands/service/__tests__/check.test.ts

@@ -50,6 +50,10 @@ let mockedConsoleLogOriginal: Console["log"] | null = null;
  */
 let mockedConsoleLogValues: string[] | null = null;
 
+// TODO: the following two functions are identical to the ones found in list.test.ts
+// we are choosing to duplicate them for now, because with a shared helper function,
+// jest overwrites console log output as the tests are run in parallel
+
 /**
  * Mock and capture `console.log` and `stdout.write`s. Return them in that order as a single string.
  *

packages/apollo/src/commands/service/__tests__/list.test.ts

@@ -40,6 +40,10 @@ let mockedConsoleLogOriginal: Console["log"] | null = null;
  */
 let mockedConsoleLogValues: string[] | null = null;
 
+// TODO: the following two functions are identical to the ones found in check.test.ts
+// we are choosing to duplicate them for now, because with a shared helper function,
+// jest overwrites console log output as the tests are run in parallel
+
 /**
  * Mock and capture `console.log` and `stdout.write`s. Return them in that order as a single string.
  *
@@ -201,9 +205,7 @@ describe("service:list", () => {
 
         expect.assertions(2);
 
-        await expect(
-          ServiceList.run([...cliKeyParameter])
-        ).resolves.not.toThrow();
+        await expect(ServiceList.run(cliKeyParameter)).resolves.not.toThrow();
 
         // Inline snapshots don't work here due to https://github.com/facebook/jest/issues/6744.
         expect(uncaptureApplicationOutput()).toMatchSnapshot();
@@ -217,9 +219,7 @@ describe("service:list", () => {
 
         expect.assertions(2);
 
-        await expect(
-          ServiceList.run([...cliKeyParameter])
-        ).resolves.not.toThrow();
+        await expect(ServiceList.run(cliKeyParameter)).resolves.not.toThrow();
 
         // Inline snapshots don't work here due to https://github.com/facebook/jest/issues/6744.
         expect(uncaptureApplicationOutput()).toMatchSnapshot();

packages/apollo/src/commands/service/list.ts

@@ -4,7 +4,11 @@ import { GraphQLSchema } from "graphql";
 import sortBy from "lodash.sortby";
 import { table } from "heroku-cli-util";
 import moment from "moment";
-import { ApolloConfig, isServiceProject } from "apollo-language-server";
+import {
+  ApolloConfig,
+  isServiceProject,
+  DefaultEngineConfig
+} from "apollo-language-server";
 import chalk from "chalk";
 import {
   ListServices_service_implementingServices,
@@ -53,9 +57,7 @@ function formatHumanReadable({
     >(implementingServices.services, [service => service.name.toUpperCase()]);
 
     table(
-      [...sortedImplementingServices.map(formatImplementingService)].filter(
-        Boolean
-      ),
+      sortedImplementingServices.map(formatImplementingService).filter(Boolean),
       {
         columns: [
           { key: "name", label: "Name" },
@@ -72,9 +74,7 @@ function formatHumanReadable({
       }
     );
     const serviceListUrlEnding = `/graph/${graphName}/service-list`;
-    const targetUrl = frontendUrl
-      ? `${frontendUrl}${serviceListUrlEnding}`
-      : `https://engine.apollographql.com${serviceListUrlEnding}`;
+    const targetUrl = `${frontendUrl}${serviceListUrlEnding}`;
     result += `\n\nView full details at: ${targetUrl}`;
   }
   return result;
@@ -161,7 +161,8 @@ export default class ServiceList extends ProjectCommand {
       formatHumanReadable({
         implementingServices: taskOutput.implementingServices,
         graphName: taskOutput.config.name,
-        frontendUrl: taskOutput.config.engine.frontend
+        frontendUrl:
+          taskOutput.config.engine.frontend || DefaultEngineConfig.frontend
       })
     );
   }