A few bits of html tidy up and formatting

DEFRA · Jan 16, 2025 · 621ea1e · 621ea1e
1 parent 6c098b2
commit 621ea1e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 27 deletions.
diff --git a/src/server/common/components/autocomplete/template.njk b/src/server/common/components/autocomplete/template.njk
@@ -8,7 +8,7 @@
 <script data-testid="app-autocomplete-suggestions">
   window.cdp = window.cdp || {}
   window.cdp.suggestions = window.cdp.suggestions || {};
-  window.cdp.suggestions.{{ params.name }} = {{ params.suggestions | dump | safe }}
+  window.cdp.suggestions["{{ params.name }}"] = {{ params.suggestions | dump | safe }}
 </script>
 
 {% set content = params.html | safe if params.html else params.text %}

diff --git a/src/server/common/components/entity-actions/template.njk b/src/server/common/components/entity-actions/template.njk
@@ -34,5 +34,4 @@
       }
     }) }}
   </div>
-  </div>
 </form>
diff --git a/src/server/common/components/entity/template.njk b/src/server/common/components/entity/template.njk
@@ -6,13 +6,7 @@
 
 {% set element = 'li' if params.isChild else 'div' %}
 
-<{{ element }}
-{% if params.isChild %}
-  class="app-entity__list-item"
-{% else %}
-  class="app-entity"
-{% endif %}
-
+<{{ element }} {% if params.isChild %}class="app-entity__list-item"{% else %}class="app-entity"{% endif %}
 data-testid="app-entity{% if params.index %}-{{ params.index }}{% endif %}">
 
 {% if params.label %}

diff --git a/src/server/common/components/icons/check-icon/template.njk b/src/server/common/components/icons/check-icon/template.njk
@@ -4,4 +4,3 @@
   <path
     d="m419-285 291-292-63-64-228 228-111-111-63 64 174 175Zm60.679 226q-86.319 0-163.646-32.604-77.328-32.603-134.577-89.852-57.249-57.249-89.852-134.57Q59-393.346 59-479.862q0-87.41 32.662-164.275 32.663-76.865 90.042-134.438 57.378-57.574 134.411-90.499Q393.147-902 479.336-902q87.55 0 164.839 32.848 77.288 32.849 134.569 90.303 57.281 57.454 90.269 134.523Q902-567.257 902-479.458q0 86.734-32.926 163.544-32.925 76.809-90.499 134.199-57.573 57.39-134.447 90.053Q567.255-59 479.679-59Z" />
 </svg>
-</svg>
diff --git a/src/server/common/components/running-service/template.njk b/src/server/common/components/running-service/template.njk
@@ -100,7 +100,7 @@
         </p>
 
         <p class="item item-deployed-by">
-          <span id=deployed-by" class="app-running-service-table__label">By</span>
+          <span id="deployed-by" class="app-running-service-table__label">By</span>
           <span aria-labelledby="deployed-by">{{ runningService.user.displayName }}</span>
         </p>
       </div>

diff --git a/src/server/deploy-service/views/details-form.njk b/src/server/deploy-service/views/details-form.njk
@@ -223,8 +223,6 @@
                 </div>
 
               </div>
-
-              </section>
             {% endcall %}
 
           {% endcall %}

diff --git a/src/server/services/proxy/views/all.njk b/src/server/services/proxy/views/all.njk
@@ -26,8 +26,10 @@
 
 {% set explainProxyRulesHtml %}
   For more information,
-  and how to modify the rules, follow the <a class="app-link app-link--underline app-link--text-colour" href="https://portal.cdp-int.defra.cloud/documentation/how-to/proxy.md" target="_blank"
-     rel="noopener noreferrer">proxy documentation</a>
+  and how to modify the rules, follow the <a class="app-link app-link--underline app-link--text-colour"
+                                             href="https://portal.cdp-int.defra.cloud/documentation/how-to/proxy.md"
+                                             target="_blank"
+                                             rel="noopener noreferrer">proxy documentation</a>
 {% endset %}
 
 {% set allEnvironmentsTables = [] %}
@@ -132,7 +134,7 @@
                                 environment: envProxy.environment
                               }
                             }) }}" class="app-link app-link--underline">
-                           View
+                            View
                           </a>
                         </p>
                       </div>

diff --git a/src/server/services/proxy/views/environment.njk b/src/server/services/proxy/views/environment.njk
@@ -16,15 +16,15 @@
 {% set modifyProxyRulesHtml %}
   To modify proxy rules,
   follow the <a class="app-link app-link--underline app-link--text-colour"
-     href="https://portal.cdp-int.defra.cloud/documentation/how-to/proxy.md" target="_blank"
-     rel="noopener noreferrer">proxy documentation</a>.
+                href="https://portal.cdp-int.defra.cloud/documentation/how-to/proxy.md" target="_blank"
+                rel="noopener noreferrer">proxy documentation</a>.
 {% endset %}
 
 {% set addProxyRulesHtml %}
   To add proxy rules,
   follow the <a class="app-link app-link--underline app-link--text-colour"
-     href="https://portal.cdp-int.defra.cloud/documentation/how-to/proxy.md" target="_blank"
-     rel="noopener noreferrer">proxy documentation</a>.
+                href="https://portal.cdp-int.defra.cloud/documentation/how-to/proxy.md" target="_blank"
+                rel="noopener noreferrer">proxy documentation</a>.
 {% endset %}
 
 {% set serviceProxyTableRows = [] %}
@@ -67,7 +67,8 @@
   {% call appSplitPane() %}
     <div class="govuk-grid-row govuk-!-margin-top-2 govuk-!-margin-left-2">
       <section class="govuk-grid-column-two-thirds-from-desktop-big">
-        <h2 class="govuk-heading-l govuk-!-margin-bottom-2" data-testid="app-environment-header">{{ environment | title }} proxy</h2>
+        <h2 class="govuk-heading-l govuk-!-margin-bottom-2"
+            data-testid="app-environment-header">{{ environment | title }} proxy</h2>
         <div class="app-section app-section--wide">
           {% if isProxySetup %}
             <p class="govuk-!-margin-bottom-4">

diff --git a/src/server/test-suites/views/test-suite.njk b/src/server/test-suites/views/test-suite.njk
@@ -37,8 +37,8 @@
                 </p>
 
                 <form action="/test-suites/run" method="post" data-js="app-form-errors">
-                  <input type="hidden" name="csrfToken" value="{{ csrfToken }}" />
-                  <input type="hidden" name="imageName" value="{{ testSuite.serviceName }}" />
+                  <input type="hidden" name="csrfToken" value="{{ csrfToken }}"/>
+                  <input type="hidden" name="imageName" value="{{ testSuite.serviceName }}"/>
 
                   {% call govukFieldset() %}
 
@@ -92,7 +92,7 @@
            data-poll-url="/test-suites/{{ testSuite.serviceName }}"
            data-poll-interval="3000"
            data-poll-limit="45">
-      {% endif %}
+        {% endif %}
 
         {% block xhrContent %}
           <article data-xhr="test-suite-runs">
@@ -122,8 +122,8 @@
           </article>
         {% endblock %}
 
-      {% if shouldPoll %}
-        </div>
+        {% if shouldPoll %}
+      </div>
       {% endif %}
 
     </div>
@@ -137,5 +137,4 @@
 
     </div>
   </div>
-
 {% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,5 +34,4 @@ @@
           }
         }) }}
       </div>
-      </div>
     </form>