Merge pull request #45 from hmrc/BDOG-82-dependency-explorer-sort-dep…

…endencies fix: Sort dependencies for a version of the service.
hmrc · Jan 24, 2019 · bc9b3f2 · bc9b3f2
2 parents 27d2446 + fedecc8
commit bc9b3f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git 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
@@ -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[_])
@@ -29,14 +31,16 @@ <h1 id="dependencies-header">Dependencies: @serviceName</h1>
                 <label class="hand-pointer">@{serviceVersion(serviceDependency.version)} @{environment(serviceDependency.environment)}</label>
             </div>
             <div id="collapsible-area-@index" class="collapse">
-                <table id="dependencies-list" class="table table-condensed">
-                    <tr>
-                        <th class="col-lg-4">Group ID</th>
-                        <th class="col-lg-4">Artifact ID</th>
-                        <th class="col-lg-4">Version</th>
-                    </tr>
+                <table id="dependencies-list" class="table table-condensed table-striped">
+                    <thead>
+                        <tr>
+                            <th class="col-lg-4">Group ID</th>
+                            <th class="col-lg-4">Artifact ID</th>
+                            <th class="col-lg-4">Version</th>
+                        </tr>
+                    </thead>
                     <tbody class="list">
-                    @for(dependency <- serviceDependency.dependencies) {
+                    @for(dependency <- DependenciesService.sortDependencies(serviceDependency.dependencies)) {
                         <tr>
                             <td><span>@dependency.group</span></td>
                             <td><span>@dependency.artifact</span></td>