Skip to content

Commit

Permalink
Made empty arrays behave the same as no array.
Browse files Browse the repository at this point in the history
  • Loading branch information
nataliecarey committed Nov 11, 2019
1 parent 2f29ead commit 28a2cb0
Show file tree
Hide file tree
Showing 13 changed files with 142 additions and 65 deletions.
118 changes: 66 additions & 52 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package/govuk/components/date-input/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
aria-describedby – for example hints or error messages -#}
{% set describedBy = params.fieldset.describedBy if params.fieldset.describedBy else "" %}

{% if params.items %}
{% if params.items | length %}
{% set dateInputItems = params.items %}
{% else %}
{% set dateInputItems = [
Expand Down
6 changes: 3 additions & 3 deletions package/govuk/components/footer/template.njk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<footer class="govuk-footer {{ params.classes if params.classes }}" role="contentinfo"
{%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
<div class="govuk-width-container {{ params.containerClasses if params.containerClasses }}">
{% if params.navigation %}
{% if params.navigation | length %}
<div class="govuk-footer__navigation">
{% for nav in params.navigation %}
<div class="govuk-footer__section">
<h2 class="govuk-footer__heading govuk-heading-m">{{ nav.title }}</h2>
{% if nav.items %}
{% if nav.items | length %}
{% set listClasses %}
{% if nav.columns %}
govuk-footer__list--columns-{{ nav.columns }}
Expand All @@ -33,7 +33,7 @@
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
{% if params.meta %}
<h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default("Support links") }}</h2>
{% if params.meta.items %}
{% if params.meta.items | length %}
<ul class="govuk-footer__inline-list">
{% for item in params.meta.items %}
<li class="govuk-footer__inline-list-item">
Expand Down
2 changes: 1 addition & 1 deletion package/govuk/components/summary-list/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{# Determine if we need 2 or 3 columns #}
{% set anyRowHasActions = false %}
{% for row in params.rows %}
{% set anyRowHasActions = true if row.actions.items else anyRowHasActions %}
{% set anyRowHasActions = true if row.actions.items | length else anyRowHasActions %}
{% endfor -%}

<dl class="govuk-summary-list {%- if params.classes %} {{ params.classes }}{% endif %}"{% for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
Expand Down
2 changes: 1 addition & 1 deletion package/govuk/components/tabs/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h2 class="govuk-tabs__title">
{{ params.title | default ("Contents") }}
</h2>
{% if(params.items) %}
{% if(params.items | length) %}
<ul class="govuk-tabs__list">
{% for item in params.items %}
{% if item %}
Expand Down
2 changes: 1 addition & 1 deletion src/govuk/components/date-input/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
aria-describedby – for example hints or error messages -#}
{% set describedBy = params.fieldset.describedBy if params.fieldset.describedBy else "" %}

{% if params.items %}
{% if params.items | length %}
{% set dateInputItems = params.items %}
{% else %}
{% set dateInputItems = [
Expand Down
9 changes: 9 additions & 0 deletions src/govuk/components/date-input/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ describe('Date input', () => {
expect($items.length).toEqual(3)
})

it('renders defaults when an empty item array is provided', () => {
const $ = render('date-input', {
items: []
})

const $items = $('.govuk-date-input__item')
expect($items.length).toEqual(3)
})

it('renders with default items', () => {
const $ = render('date-input', {})

Expand Down
6 changes: 3 additions & 3 deletions src/govuk/components/footer/template.njk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<footer class="govuk-footer {{ params.classes if params.classes }}" role="contentinfo"
{%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
<div class="govuk-width-container {{ params.containerClasses if params.containerClasses }}">
{% if params.navigation %}
{% if params.navigation | length %}
<div class="govuk-footer__navigation">
{% for nav in params.navigation %}
<div class="govuk-footer__section">
<h2 class="govuk-footer__heading govuk-heading-m">{{ nav.title }}</h2>
{% if nav.items %}
{% if nav.items | length %}
{% set listClasses %}
{% if nav.columns %}
govuk-footer__list--columns-{{ nav.columns }}
Expand All @@ -33,7 +33,7 @@
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
{% if params.meta %}
<h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default("Support links") }}</h2>
{% if params.meta.items %}
{% if params.meta.items | length %}
<ul class="govuk-footer__inline-list">
{% for item in params.meta.items %}
<li class="govuk-footer__inline-list-item">
Expand Down
18 changes: 18 additions & 0 deletions src/govuk/components/footer/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ describe('footer', () => {
expect($component.attr('role')).toEqual('contentinfo')
})

it('no items displayed when no item array is provided', () => {
const $ = render('footer', {
navigation: []
})

const $component = $('.govuk-footer')
expect($component.find('.govuk-footer__navigation').length).toEqual(0)
})

it('renders attributes correctly', () => {
const $ = render('footer', {
attributes: {
Expand Down Expand Up @@ -83,6 +92,15 @@ describe('footer', () => {
expect($heading.text()).toEqual('Support links')
})

it('doesn\'t render footer link list when no items are provided', () => {
const $ = render('footer', {
meta: { items: [] }
})

const $component = $('.govuk-footer')
expect($component.find('.govuk-footer__inline-list').length).toEqual(0)
})

it('renders links', () => {
const $ = render('footer', examples['with meta'])

Expand Down
2 changes: 1 addition & 1 deletion src/govuk/components/summary-list/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{# Determine if we need 2 or 3 columns #}
{% set anyRowHasActions = false %}
{% for row in params.rows %}
{% set anyRowHasActions = true if row.actions.items else anyRowHasActions %}
{% set anyRowHasActions = true if row.actions.items | length else anyRowHasActions %}
{% endfor -%}

<dl class="govuk-summary-list {%- if params.classes %} {{ params.classes }}{% endif %}"{% for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
Expand Down
24 changes: 23 additions & 1 deletion src/govuk/components/summary-list/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ describe('Data list', () => {

expect($action.hasClass('govuk-link--no-visited-state')).toBeTruthy()
})
it('skips the action column when none are provided', async () => {
it('skips the action column when array is provided', async () => {
const $ = render('summary-list', {
rows: [
{
Expand All @@ -402,6 +402,28 @@ describe('Data list', () => {

expect($action.length).toEqual(0)
})
it('skips the action column no items are in the array provided', async () => {
const $ = render('summary-list', {
rows: [
{
key: {
text: 'Name'
},
value: {
text: 'Firstname Lastname'
},
actions: {
items: []
}
}
]
})

const $component = $('.govuk-summary-list')
const $action = $component.find('.govuk-summary-list__actions')

expect($action.length).toEqual(0)
})
it('adds dummy action columns when only some rows have actions', async () => {
const $ = render('summary-list', {
rows: [
Expand Down
2 changes: 1 addition & 1 deletion src/govuk/components/tabs/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h2 class="govuk-tabs__title">
{{ params.title | default ("Contents") }}
</h2>
{% if(params.items) %}
{% if(params.items | length) %}
<ul class="govuk-tabs__list">
{% for item in params.items %}
{% if item %}
Expand Down
14 changes: 14 additions & 0 deletions src/govuk/components/tabs/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@ describe('Tabs', () => {
})

describe('items', () => {
it('doesn\'t render a list if items is not defined', () => {
const $ = render('tabs', {})

const $component = $('.govuk-tabs')
expect($component.find('.govuk-tabs__list').length).toEqual(0)
})

it('doesn\'t render a list if items is empty', () => {
const $ = render('tabs', { items: [] })

const $component = $('.govuk-tabs')
expect($component.find('.govuk-tabs__list').length).toEqual(0)
})

it('render a matching tab and panel using item id', () => {
const $ = render('tabs', {
items: [
Expand Down

0 comments on commit 28a2cb0

Please sign in to comment.