@defra/lis-infra-ui-services 0.28.0 → 0.29.0-lreg-665.alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/lis-infra-ui-services",
-  "version": "0.28.0",
+  "version": "0.29.0-lreg-665.alpha.2",
   "description": "UI-Services shared definitions for the livestock taxonomy topology.",
   "main": "src/index.js",
   "repository": {

package/src/components/autocomplete.scss

@@ -1,5 +1,5 @@
 @use 'accessible-autocomplete/dist/accessible-autocomplete.min.css';
-@use 'govuk-frontend' as *;
+@use 'govuk-frontend/dist/govuk/base' as *;
 
 .app-autocomplete .autocomplete__input.govuk-input--error,
 .app-autocomplete .autocomplete__hint.govuk-input--error {

package/src/components/search-form.scss

@@ -1,6 +1,10 @@
 // Modelled on govuk_publishing_components' gem-c-search (large, on-white
 // variant): https://github.com/alphagov/govuk_publishing_components
-@use 'govuk-frontend' as *;
+// Only govuk-frontend's settings, tools and helpers are used here, never its
+// full entry point: that emits every govuk rule again wherever it resolves to
+// a second copy of the package (a symlinked install does), and the repeat
+// lands after this package's rules and overrides them.
+@use 'govuk-frontend/dist/govuk/base' as *;
 
 $lis-search-form-input-size: 50px;
 

package/src/components/service-navigation.scss

@@ -1,5 +1,8 @@
 /* Pushes the Sign out item to the end of the service navigation bar.
-   base.njk renders it with the app-service-navigation__item--right class. */
+   base.njk renders it with the app-service-navigation__item--right class.
+   govuk-frontend lays the list out as a flex row from tablet up, so an auto
+   margin is all it takes. This file deliberately uses nothing from
+   govuk-frontend: see the note in search-form.scss. */
 .app-service-navigation__item--right {
   margin-left: auto;
 }

package/src/components/sortable-paginated-table.scss

@@ -1,4 +1,4 @@
-@use 'govuk-frontend' as *;
+@use 'govuk-frontend/dist/govuk/base' as *;
 
 .lis-sortable-table__link {
   display: inline-flex;

package/src/components/sub-navigation.scss

@@ -1,4 +1,4 @@
-@use 'govuk-frontend' as *;
+@use 'govuk-frontend/dist/govuk/base' as *;
 
 .lis-sub-navigation {
   margin-bottom: govuk-spacing(6);

package/src/nunjucks/routes/error/error-pages.test.js

@@ -85,6 +85,34 @@ describe('error pages', () => {
     expect(html).not.toContain('Sign in')
   })
 
+  test('not authorised offers a sign out button when signOutHref is given', () => {
+    // Arrange
+    const context = { signOutHref: '/signout' }
+
+    // Act
+    const html = render('error/not-authorised.njk', context)
+
+    // Assert
+    expect(html).toContain(
+      '<a href="/signout" role="button" draggable="false" class="govuk-button" data-module="govuk-button">Sign out</a>'
+    )
+    expect(html).not.toContain('Sign in')
+  })
+
+  test('not authorised prefers sign out over sign in when both are given', () => {
+    // Arrange
+    const context = { signInHref: '/auth/login', signOutHref: '/signout' }
+
+    // Act
+    const html = render('error/not-authorised.njk', context)
+
+    // Assert
+    expect(html).toContain('href="/signout"')
+    expect(html).toContain('Sign out')
+    expect(html).not.toContain('Sign in')
+    expect(html).not.toContain('/auth/login')
+  })
+
   test('not authorised shows the heading and the support link', () => {
     // Arrange
     const context = {

package/src/nunjucks/routes/error/not-authorised.njk

@@ -6,7 +6,9 @@
       <h1 class="govuk-heading-l">Sorry, you are not authorised to view this page</h1>
       <p class="govuk-body">Check your details are correct and try again.</p>
       <p class="govuk-body">If you think this is incorrect <a class="govuk-link" href="{{ errorPages.contactHref }}">contact our support team</a>.</p>
-      {% if signInHref %}
+      {% if signOutHref %}
+        <a href="{{ signOutHref }}" role="button" draggable="false" class="govuk-button" data-module="govuk-button">Sign out</a>
+      {% elif signInHref %}
         <a href="{{ signInHref }}" role="button" draggable="false" class="govuk-button" data-module="govuk-button">Sign in</a>
       {% endif %}
     </div>