feat: refactor project count

snyk · Nov 4, 2019 · 5dccb99 · 5dccb99
1 parent 17410d5
commit 5dccb99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/cli/commands/monitor/formatters/format-monitor-response.ts b/src/cli/commands/monitor/formatters/format-monitor-response.ts
@@ -1,15 +1,18 @@
 import * as _ from 'lodash';
 import chalk from 'chalk';
-import {MonitorResult } from '../../../../lib/types';
+import { MonitorResult } from '../../../../lib/types';
 
 export function formatMonitorOutput(
   packageManager,
   res: MonitorResult,
   manageUrl,
   options,
   projectName?: string,
-  advertiseSubprojectsCount?: number | null,
-) {
+  foundProjectCount?: number,
+): string {
+  const advertiseGradleSubProjectsCount =
+    packageManager === 'gradle' && !options['gradle-sub-project'];
+
   const issues = res.licensesPolicy ? 'issues' : 'vulnerabilities';
   const humanReadableName = projectName
     ? `${res.path} (${projectName})`
@@ -22,9 +25,9 @@ export function formatMonitorOutput(
     'Explore this snapshot at ' +
     res.uri +
     '\n\n' +
-    (advertiseSubprojectsCount
+    (advertiseGradleSubProjectsCount && foundProjectCount
       ? chalk.bold.white(
-          `This project has multiple sub-projects (${advertiseSubprojectsCount}), ` +
+          `This project has multiple sub-projects (${foundProjectCount}), ` +
             'use --all-sub-projects flag to scan all sub-projects.\n\n',
         )
       : '') +

diff --git a/src/cli/commands/monitor/index.ts b/src/cli/commands/monitor/index.ts
@@ -163,16 +163,11 @@ async function monitor(...args0: MethodArgs): Promise<any> {
       // a MultiProjectResult to an array of these.
 
       let perProjectResult: pluginApi.SinglePackageResult[] = [];
-      let advertiseSubprojectsCount: number | null = null;
+      let foundProjectCount;
       if (pluginApi.isMultiResult(inspectResult)) {
         perProjectResult = convertMultiPluginResultToSingle(inspectResult);
       } else {
-        if (packageManager === 'gradle') {
-          advertiseSubprojectsCount = getSubProjectCountForGradle(
-            inspectResult,
-            options['gradle-sub-project'],
-          );
-        }
+        foundProjectCount = getSubProjectCount(inspectResult);
         perProjectResult = [inspectResult];
       }
 
@@ -206,7 +201,7 @@ async function monitor(...args0: MethodArgs): Promise<any> {
           manageUrl,
           options,
           projectName,
-          advertiseSubprojectsCount,
+          foundProjectCount,
         );
         results.push({ ok: true, data: monOutput, path, projectName });
       }
@@ -274,12 +269,8 @@ function convertMultiPluginResultToSingle(
   }));
 }
 
-function getSubProjectCountForGradle(
-  inspectResult,
-  calledForSingleSubProject,
-): number | null {
+function getSubProjectCount(inspectResult): number | null {
   if (
-    !calledForSingleSubProject &&
     inspectResult.plugin.meta &&
     inspectResult.plugin.meta.allSubProjectNames &&
     inspectResult.plugin.meta.allSubProjectNames.length > 1