Skip to content

Commit

Permalink
Merge pull request #931 from snyk/chore/refactor-manage-url
Browse files Browse the repository at this point in the history
chore: refactor manage url into a function
  • Loading branch information
lili2311 committed Dec 31, 2019
2 parents ef9f2b6 + 043c23f commit cad38e3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
19 changes: 18 additions & 1 deletion src/cli/commands/monitor/formatters/format-monitor-response.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
import * as _ from 'lodash';
import chalk from 'chalk';
import * as url from 'url';

import { MonitorResult } from '../../../../lib/types';
import * as config from '../../../../lib/config';

export function formatMonitorOutput(
packageManager,
res: MonitorResult,
manageUrl,
options,
projectName?: string,
foundProjectCount?: number,
): string {
const manageUrl = buildManageUrl(res.id, res.org);
const advertiseGradleSubProjectsCount =
packageManager === 'gradle' && !options['gradle-sub-project'];

Expand Down Expand Up @@ -61,3 +64,17 @@ export function formatMonitorOutput(
)
: strOutput;
}

function buildManageUrl(resId: string, org?: string): string {
const endpoint = url.parse(config.API);
let leader = '';
if (org) {
leader = '/org/' + org;
}
endpoint.pathname = leader + '/manage';
const manageUrl = url.format(endpoint);

// TODO: what was this meant to do?
endpoint.pathname = leader + '/monitor/' + resId;
return manageUrl;
}
10 changes: 0 additions & 10 deletions src/cli/commands/monitor/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,22 +169,12 @@ async function monitor(...args0: MethodArgs): Promise<any> {
await spinner.clear(postingMonitorSpinnerLabel)(res);

res.path = path;
const endpoint = url.parse(config.API);
let leader = '';
if (res.org) {
leader = '/org/' + res.org;
}
endpoint.pathname = leader + '/manage';
const manageUrl = url.format(endpoint);

endpoint.pathname = leader + '/monitor/' + res.id;
const projectName = pluginApi.isMultiResult(inspectResult)
? projectDeps.package.name
: undefined;
const monOutput = formatMonitorOutput(
packageManager,
res,
manageUrl,
options,
projectName,
foundProjectCount,
Expand Down

0 comments on commit cad38e3

Please sign in to comment.