From d2dc53599d4f270df4ce000d630dc2ba9078a001 Mon Sep 17 00:00:00 2001
From: Ian McShane <557595+IanMcShane@users.noreply.github.com>
Date: Thu, 24 Jan 2019 14:11:16 +0000
Subject: [PATCH 1/2] fix: Sort dependencies for a specific version.
---
.../cataloguefrontend/service/DependenciesService.scala | 8 ++++++++
app/views/DependenciesPage.scala.html | 4 +++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/app/uk/gov/hmrc/cataloguefrontend/service/DependenciesService.scala b/app/uk/gov/hmrc/cataloguefrontend/service/DependenciesService.scala
index 2634b670b..4e9c5fc93 100644
--- a/app/uk/gov/hmrc/cataloguefrontend/service/DependenciesService.scala
+++ b/app/uk/gov/hmrc/cataloguefrontend/service/DependenciesService.scala
@@ -55,6 +55,14 @@ class DependenciesService @Inject()(serviceDependenciesConnector: ServiceDepende
}
+object DependenciesService {
+
+ def sortDependencies(dependencies: Seq[ServiceDependency]): Seq[ServiceDependency] = {
+ dependencies.sortBy(serviceDependency => (serviceDependency.group, serviceDependency.artifact))
+ }
+
+}
+
case class ServiceDependency(path: String, group: String, artifact: String, version: String, meta: String = "")
case class ServiceDependencies(uri: String,
name: String,
diff --git a/app/views/DependenciesPage.scala.html b/app/views/DependenciesPage.scala.html
index 80f7b514b..ae1d32257 100644
--- a/app/views/DependenciesPage.scala.html
+++ b/app/views/DependenciesPage.scala.html
@@ -16,6 +16,8 @@
@import uk.gov.hmrc.cataloguefrontend.ViewMessages
@import uk.gov.hmrc.cataloguefrontend.service.ServiceDependencies
+@import uk.gov.hmrc.cataloguefrontend.service.ServiceDependency
+@import uk.gov.hmrc.cataloguefrontend.service.DependenciesService
@this(viewMessages: ViewMessages)
@(serviceName: String, serviceDependencies: Seq[ServiceDependencies])(implicit request: Request[_])
@@ -36,7 +38,7 @@
Version |
- @for(dependency <- serviceDependency.dependencies) {
+ @for(dependency <- DependenciesService.sortDependencies(serviceDependency.dependencies)) {
@dependency.group |
@dependency.artifact |
From fedecc89264a7bcdaebca1bdeac5158f4a1faa6c Mon Sep 17 00:00:00 2001
From: Ian McShane <557595+IanMcShane@users.noreply.github.com>
Date: Thu, 24 Jan 2019 14:22:43 +0000
Subject: [PATCH 2/2] fix: change to a striped table for readability.
---
app/views/DependenciesPage.scala.html | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/views/DependenciesPage.scala.html b/app/views/DependenciesPage.scala.html
index ae1d32257..e48f4d7fb 100644
--- a/app/views/DependenciesPage.scala.html
+++ b/app/views/DependenciesPage.scala.html
@@ -31,12 +31,14 @@
-
-
- Group ID |
- Artifact ID |
- Version |
-
+
+
+
+ Group ID |
+ Artifact ID |
+ Version |
+
+
@for(dependency <- DependenciesService.sortDependencies(serviceDependency.dependencies)) {