hmrc · IanMcShane · Jan 14, 2019 · Jan 11, 2019 · Jan 11, 2019 · Jan 11, 2019
diff --git a/app/assets/catalogue-frontend.scss b/app/assets/catalogue-frontend.scss
@@ -300,4 +300,15 @@ section {
   font-size: 9px;
 }
 
-
+.board__heading .accordion-toggle:after {
+  /* symbol for "opening" panels */
+  font-family: 'Glyphicons Halflings';
+  content: "\e114";
+  float: right;
+  color: grey;
+}
+
+.board__heading .accordion-toggle.collapsed:after {
+  /* symbol for "collapsed" panels */
+  content: "\e080";
+}
diff --git a/app/views/partials/code_and_builds.scala.html b/app/views/partials/code_and_builds.scala.html
@@ -33,10 +33,25 @@ <h3 class="board__heading">Code and Build</h3>
                 <li class="list-item"><a id="link-to-@{ciLink.id}" href="@{ciLink.url}" target="_blank">@{ciLink.displayName}<span class="glyphicon glyphicon-new-window"/></a></li>
             }
             @if(CatalogueFrontendSwitches.routingRules.isEnabled && environmentRoute.isDefined) {
-                @for((route, index) <- environmentRoute.get.routes.zipWithIndex) {
-                <li id="route-rule-@index" class="list-item">
-                    <a target="_blank" title="@route.frontendPath" href="@route.ruleConfigurationUrl">Routing Configuration: '@route.frontendPath' <span class="glyphicon glyphicon-new-window"/></a>
-                </li>
+                @defining(environmentRoute.get.routes.size > 3) { collapsable =>
+                    <div class="board">
+                        <h5 class="board__heading" id="headingRSU">
+                            <div class="@if(collapsable){accordion-toggle collapsed}" data-toggle="@if(collapsable) {collapse}" data-target="#collapseRSU" aria-expanded="@if(collapsable) {false} else {true}" aria-controls="collapseRSU">
+                                Routing Configuration(s):
+                            </div>
+                        </h5>
+                        <div class="board__body">
+                            <div id="collapseRSU" class="@if(collapsable) {collapse}" aria-labelledby="headingRSU">
+                                <ul id="production-urls" class="list list--minimal">
+                                    @for((route, index) <- environmentRoute.get.routes.zipWithIndex) {
+                                        <li id="route-rule-@index" class="list-item">
+                                            <a target="_blank" title="@route.frontendPath" href="@route.ruleConfigurationUrl">@route.frontendPath<span class="glyphicon glyphicon-new-window"/></a>
+                                        </li>
+                                    }
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
                 }
             }
             </ul>

diff --git a/app/views/partials/details.scala.html b/app/views/partials/details.scala.html
@@ -39,22 +39,34 @@ <h3 class="board__heading">Details</h3>
                 </li>
             </ul>
             @if(CatalogueFrontendSwitches.routingRules.isEnabled && environmentRoute.isDefined) {
-            <ul id="service-urls-section" class="list list--minimal">
-                <li class="list-item">
-                    <label>URL(s):</label>
-                    <ul id="production-urls" class="list list--minimal">
-                    @for((route, index) <- environmentRoute.get.routes.zipWithIndex) {
-                        <li id="url-@index" class="list-item">
-                            @if(route.isRegex) {
-                            @route.frontendPath
-                            } else {
-                            <a href="https://[email protected]" target="_blank">@route.frontendPath <span class="glyphicon glyphicon-new-window"/></a>
-                            }
-                        </li>
-                    }
+                @defining(environmentRoute.get.routes.size > 3) { collapsable =>
+                    <ul id="service-urls-section" class="list list--minimal">
+                        <div class="board">
+                            <li class="list-item">
+                                <h5 class="board__heading" id="headingSU">
+                                    <div class="@if(collapsable){accordion-toggle collapsed}" data-toggle="@if(collapsable) {collapse}" data-target="#collapseSU" aria-expanded="@if(collapsable) {false} else {true}" aria-controls="collapseSU">
+                                        URL(s):
+                                    </div>
+                                </h5>
+                                <div class="board__body">
+                                    <div id="collapseSU" class="@if(collapsable) {collapse}" aria-labelledby="headingSU">
+                                        <ul id="production-urls" class="list list--minimal">
+                                            @for((route, index) <- environmentRoute.get.routes.zipWithIndex) {
+                                                <li id="url-@index" class="list-item">
+                                                    @if(route.isRegex) {
+                                                        @route.frontendPath
+                                                    } else {
+                                                        <a href="https://[email protected]" target="_blank">@route.frontendPath <span class="glyphicon glyphicon-new-window"/></a>
+                                                    }
+                                                </li>
+                                            }
+                                        </ul>
+                                    </div>
+                                </div>
+                            </li>
+                        </div>
                     </ul>
-                </li>
-            </ul>
+                }
             }
         </div>
     </div>

diff --git a/app/views/partials/serviceRouteRuleViolations.scala.html b/app/views/partials/serviceRouteRuleViolations.scala.html
@@ -19,32 +19,39 @@
 
 @(serviceRoutes: ServiceRoutes)
 @if(CatalogueFrontendSwitches.routingRules.isEnabled && serviceRoutes.hasInconsistentRoutes) {
-    <div id="routing-rule-violations" >
-        <div class="board" class="col-md-12">
-            <h3 class="board__heading red">Inconsistent Route Rules</h3>
-            <div class="board__body">
-                <table id="routing-rule-list" class="table">
-                    <tr>
-                        <th class="col-lg-2">Environment</th>
-                        <th class="col-lg-10">Route Rule</th>
-                    </tr>
-                    <tbody>
-                    @for(environmentRoute <- serviceRoutes.inconsistentRoutes) {
-                        @for(route <- environmentRoute.routes) {
-                        <tr>
-                            <td>
-                                <a target="_blank" href="@route.ruleConfigurationUrl" title="Route Rule Configuration">@environmentRoute.environment <span class="glyphicon glyphicon-new-window"/></a>
-                            </td>
-                            <td>
-                                @route.frontendPath
-                            </td>
-                        </tr>
-                        }
-                    }
-                    </tbody>
-                </table>
-                </ul>
+    @defining(serviceRoutes.inconsistentRoutes.size > 3) { collapsable =>
+        <div id="routing-rule-violations" >
+            <div class="accordion board" class="col-md-12">
+                <h3 class="board__heading red" id="headingSRRV">
+                    <div class="@if(collapsable){accordion-toggle collapsed}" data-toggle="@if(collapsable) {collapse}" data-target="#collapseSRRV" aria-expanded="@if(collapsable) {false} else {true}" aria-controls="collapseSRRV">
+                        Inconsistent Route Rules
+                    </div>
+                </h3>
+                <div id="collapseSRRV" class="@if(collapsable) {collapse}" aria-labelledby="headingSRRV">
+                    <div class="board__body">
+                        <table id="routing-rule-list" class="table">
+                            <tr>
+                                <th class="col-lg-2">Environment</th>
+                                <th class="col-lg-10">Route Rule</th>
+                            </tr>
+                            <tbody>
+                            @for(environmentRoute <- serviceRoutes.inconsistentRoutes) {
+                                @for(route <- environmentRoute.routes) {
+                                <tr>
+                                    <td>
+                                        <a target="_blank" href="@route.ruleConfigurationUrl" title="Route Rule Configuration">@environmentRoute.environment <span class="glyphicon glyphicon-new-window"/></a>
+                                    </td>
+                                    <td>
+                                        @route.frontendPath
+                                    </td>
+                                </tr>
+                                }
+                            }
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
+    }
 }
diff --git a/catalogue-frontend.css b/catalogue-frontend.css
diff --git a/public/catalogue-frontend.css b/public/catalogue-frontend.css
@@ -11763,7 +11763,7 @@ h1 {
   padding-bottom: .2em;
   border-bottom: 3px solid #008770; }
 
-h1, h2, h3, h4 {
+h1, h2, h3, h4, h5 {
   color: #008770;
   font-weight: 700; }
 
@@ -11830,6 +11830,7 @@ section span.other-teams-message {
 .list {
   overflow: hidden;
   padding-left: 1.2em;
+  padding-right: 1.2em;
   list-style: disc;
   color: #6f777b;
   margin-bottom: .4em; }
@@ -12028,4 +12029,17 @@ section span.other-teams-message {
   position:relative;
   z-index:0;
   width: 100%;
+}
+
+.accordion-toggle:after {
+  /* symbol for "opening" panels */
+  font-family: 'Glyphicons Halflings';
+  content: "\e114";
+  float: right;
+  color: grey;
+}
+
+.accordion-toggle.collapsed:after {
+  /* symbol for "collapsed" panels */
+  content: "\e080";
 }
diff --git a/test/uk/gov/hmrc/cataloguefrontend/AuthControllerSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/AuthControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/CatalogueControllerSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/CatalogueControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/ChartDataSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/ChartDataSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/DependencyReportControllerSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/DependencyReportControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/DeploymentsFilterSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/DeploymentsFilterSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/DeploymentsServiceSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/DeploymentsServiceSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/DigitalServicePageSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/DigitalServicePageSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/DigitalServicesSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/DigitalServicesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/DisplayableTeamMembersSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/DisplayableTeamMembersSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/IndicatorsConnectorSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/IndicatorsConnectorSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/JsonData.scala b/test/uk/gov/hmrc/cataloguefrontend/JsonData.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/LibrariesSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/LibrariesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/LibraryPageSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/LibraryPageSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/PrototypePageSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/PrototypePageSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/PrototypesSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/PrototypesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/ReleaseSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/ReleaseSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/RepoTypeSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/RepoTypeSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/RepositoriesSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/RepositoriesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/RepositoryFilteringSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/RepositoryFilteringSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/RepositoryPageSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/RepositoryPageSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/SearchFilteringSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/SearchFilteringSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/ServiceOwnerSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/ServiceOwnerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/ServicePageSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/ServicePageSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/cataloguefrontend/ServicesSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/ServicesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 HM Revenue & Customs
+ * Copyright 2019 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.