From 74ab64547576efec87228831eb5b1b5f18b814a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0est=C3=A1k=20V=C3=ADt?= <Vit.Sestak@ysoft.com>
Date: Thu, 15 Jun 2017 17:30:15 +0200
Subject: [PATCH] Added list of all project, including those not included by
 the filter

---
 app/assets/css/main.css                     |  4 ++++
 app/controllers/Statistics.scala            | 10 ++++++++++
 app/views/affectedProjects.scala.html       |  6 ++++++
 app/views/dependencyDetailsInner.scala.html | 14 +++++++++++++-
 conf/routes                                 |  1 +
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/views/affectedProjects.scala.html

diff --git a/app/assets/css/main.css b/app/assets/css/main.css
index 7f94457..cddaead 100644
--- a/app/assets/css/main.css
+++ b/app/assets/css/main.css
@@ -238,4 +238,8 @@ h3.library-identification{
     padding-left: 1em;
     font-family: 'Glyphicons Halflings';
     content: "\e209";
+}
+
+.sublist{
+    padding-left: 23px;
 }
\ No newline at end of file
diff --git a/app/controllers/Statistics.scala b/app/controllers/Statistics.scala
index 5faa382..59f7733 100644
--- a/app/controllers/Statistics.scala
+++ b/app/controllers/Statistics.scala
@@ -312,6 +312,16 @@ class Statistics @Inject()(
     }
   }
 
+  def affectedProjects(depId: Hashes) = ReadAction.async { implicit req =>
+    val (lastRefreshTime, resultsFuture) = projectReportsProvider.resultsForVersions(versions)
+    resultsFuture flatMap { case (successfulResults, failedResults) =>
+      val selection = dependencyCheckReportsParser.parseReports(successfulResults, failedResults)
+      Future.successful(Ok(views.html.affectedProjects(
+        dep = selection.groupedDependenciesByHashes(depId)
+      )).withHeaders("Content-type" -> "text/plain; charset=utf-8"))
+    }
+  }
+
   def allFiles(selectorOption: Option[String]) = ReadAction.async { implicit req =>
     val (lastRefreshTime, resultsFuture) = projectReportsProvider.resultsForVersions(versions)
     resultsFuture flatMap { allResults =>
diff --git a/app/views/affectedProjects.scala.html b/app/views/affectedProjects.scala.html
new file mode 100644
index 0000000..20f7dea
--- /dev/null
+++ b/app/views/affectedProjects.scala.html
@@ -0,0 +1,6 @@
+@(dep: GroupedDependency)
+<ul>
+    @for(p <- dep.projects.toIndexedSeq.sorted){
+        <li>@friendlyProjectName(p)</li>
+    }
+</ul>
diff --git a/app/views/dependencyDetailsInner.scala.html b/app/views/dependencyDetailsInner.scala.html
index 118bd1b..38f1948 100644
--- a/app/views/dependencyDetailsInner.scala.html
+++ b/app/views/dependencyDetailsInner.scala.html
@@ -63,7 +63,19 @@
     </table>
 </div>
 <h4 class="expandable" data-toggle="collapse" data-target="#@depPrefix-projects-details">Affected projects (@dep.projects.size)</h4>
-<ul id="@depPrefix-projects-details" class="collapse in">@for(p <- dep.projects.toIndexedSeq.sorted){<li>@friendlyProjectName(p)</li>}</ul>
+<div id="@depPrefix-projects-details" class="collapse in">
+    <ul>
+        @for(p <- dep.projects.toIndexedSeq.sorted){
+            <li>@friendlyProjectName(p)</li>
+        }
+    </ul>
+    @if(selectorOption.isDefined){
+        <h5 class="expandable collapsed sublist" data-toggle="collapse" data-target="#@depPrefix-projects-all-details">All affected projects (including those that aren't included by the filter)</h5>
+        <div id="@depPrefix-projects-all-details" class="collapse" data-lazyload-url="@routes.Statistics.affectedProjects(
+            depId = dep.hashes
+        )"></div>
+    }
+</div>
 <h4 class="expandable" data-toggle="collapse" data-target="#@depPrefix-vulnerabilities-details">Vulnerabilities (@dep.vulnerabilities.size)</h4>
 <ul id="@depPrefix-vulnerabilities-details" class="collapse in vulnerabilities-details">
     @for(vuln <- dep.vulnerabilities.toSeq.sortBy(_.cvssScore.map(-_)); vulnPrefix = s"$depPrefix-vulnerabilities-details-${vuln.name}"){
diff --git a/conf/routes b/conf/routes
index 41ac2e3..72806b5 100644
--- a/conf/routes
+++ b/conf/routes
@@ -23,6 +23,7 @@ GET         /https-test/with-redirect         controllers.Application.testHttps(
 GET         /https-test                       controllers.Application.testHttps(allowRedirect: Boolean = false)
 
 GET         /stats/dependency-details.htmlf   controllers.Statistics.dependencyDetails(selectorOption: Option[String], depPrefix: String, depId: com.ysoft.odc.Hashes)
+GET         /stats/affected-projects.htmlf    controllers.Statistics.affectedProjects(depId: com.ysoft.odc.Hashes)
 GET         /stats/basic                      controllers.Statistics.basic(selector: Option[String] = None)
 GET         /stats/basic/*selector            controllers.Statistics.basic(selector: Option[String])
 GET         /stats/details                    controllers.Statistics.vulnerabilities(selector: Option[String], tagId: Option[Int])