Merge pull request #131 from ruromero/npm-fix

fix: broken links in report for npm
RHEcosystemAppEng · Aug 29, 2023 · f7adac4 · f7adac4
2 parents c4634c9 + 98f13e0
commit f7adac4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/src/main/java/com/redhat/exhort/integration/report/ReportTransformer.java b/src/main/java/com/redhat/exhort/integration/report/ReportTransformer.java
@@ -170,6 +170,7 @@ private List<TransitiveDependencyReport> getTransitiveDependenciesReport(
 
     List<TransitiveDependencyReport> result = new ArrayList<>();
     start.transitive().stream()
+        .filter(Objects::nonNull)
         .forEach(
             d -> {
               List<Issue> issues = request.issues().get(d.name());

diff --git a/src/main/java/com/redhat/exhort/integration/snyk/SnykRequestBuilder.java b/src/main/java/com/redhat/exhort/integration/snyk/SnykRequestBuilder.java
@@ -52,7 +52,7 @@ public String fromDiGraph(GraphRequest req) throws JsonProcessingException {
   }
 
   private JsonNode addPackages(ObjectNode depGraph, DependencyTree tree) {
-    Set<com.redhat.exhort.api.PackageRef> allDeps = tree.getAll();
+    Set<PackageRef> allDeps = tree.getAll();
     ObjectNode rootNode = createNode(tree.root(), allDeps);
     ArrayNode nodes = mapper.createArrayNode().add(rootNode);
     ArrayNode pkgs = mapper.createArrayNode().add(createPkg(tree.root()));

diff --git a/src/main/java/com/redhat/exhort/model/DependencyTree.java b/src/main/java/com/redhat/exhort/model/DependencyTree.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import com.redhat.exhort.api.PackageRef;
 
@@ -66,8 +67,15 @@ public int count() {
 
   public Set<PackageRef> getAll() {
     Set<PackageRef> result = new HashSet<>(dependencies.keySet());
-    dependencies.values().forEach(d -> result.addAll(d.transitive()));
-    return result;
+    dependencies
+        .values()
+        .forEach(
+            d -> {
+              if (d.transitive() != null && !d.transitive().isEmpty()) {
+                result.addAll(d.transitive());
+              }
+            });
+    return result.stream().filter(Objects::nonNull).collect(Collectors.toSet());
   }
 
   public static Builder builder() {

diff --git a/src/main/resources/freemarker/templates/generated/main.js b/src/main/resources/freemarker/templates/generated/main.js
diff --git a/ui/src/utils/utils.ts b/ui/src/utils/utils.ts
@@ -4,15 +4,24 @@ export const SYNK_SIGNUP_URL =
 const MAVEN_PREFIX = 'pkg:maven';
 const MAVEN_URL = 'https://central.sonatype.com/artifact/';
 
+const NPM_PREFIX = 'pkg:npm';
+const NPM_URL = 'https://www.npmjs.com/package/';
+
 export const extractDependencyName = (name: string) => {
   if (name.startsWith(MAVEN_PREFIX)) {
     return name
       .substring(0, name.lastIndexOf('@')) // Remove version
       .substring(MAVEN_PREFIX.length + 1, name.length) // Remove package prefix
       .replace(/\//g, ':');
-  } else {
-    return name;
   }
+  if (name.startsWith(NPM_PREFIX)) {
+    return name
+    .substring(0, name.lastIndexOf('@')) // Remove version
+    .substring(NPM_PREFIX.length + 1, name.length) // Remove package prefix
+    .replace(/\//g, ':');
+  }
+  return name;
+
 };
 
 export const extractDependencyUrl = (name: string) => {
@@ -23,17 +32,23 @@ export const extractDependencyUrl = (name: string) => {
         .replace(/@([^@]*)$/, '/$1') // Replace last '@' by '/'
         .substring(MAVEN_PREFIX.length + 1, name.length) // Remove package prefix
     );
-  } else {
-    return name;
   }
+  if (name.startsWith(NPM_PREFIX)) {
+    return (
+      NPM_URL +
+      name
+        .replace(/@([^@]*)$/, '/v/$1') // Replace last '@' by '/v/'
+        .substring(NPM_PREFIX.length + 1, name.length + 2) // Remove package prefix
+    );
+  }
+  return name;
 };
 
 export const extractDependencyVersion = (name: string) => {
-  if (name.startsWith(MAVEN_PREFIX)) {
+  if (name.startsWith(MAVEN_PREFIX) || name.startsWith(NPM_PREFIX)) {
     return name.substring(name.lastIndexOf('@') + 1, name.length);
-  } else {
-    return name;
   }
+  return name;
 };
 
 export const issueLink = (provider: 'snyk' | 'oss-index', issueId: string) => {