From cfc390b1790b3092254836668a801b6ef51b3d65 Mon Sep 17 00:00:00 2001 From: Mike Stone Date: Wed, 22 Feb 2017 11:05:06 -0500 Subject: [PATCH] Renders All Platform Icon if platform is null (#1243) --- .../ScheduledQueriesListItem.jsx | 6 +++--- .../ScheduledQueriesListItem.tests.jsx | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx index a10d81b3a1..cfbd1e69db 100644 --- a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx +++ b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.jsx @@ -4,7 +4,7 @@ import Checkbox from 'components/forms/fields/Checkbox'; import ClickableTableRow from 'components/ClickableTableRow'; import Icon from 'components/icons/Icon'; import PlatformIcon from 'components/icons/PlatformIcon'; -import { isEqual } from 'lodash'; +import { isEmpty, isEqual } from 'lodash'; import scheduledQueryInterface from 'interfaces/scheduled_query'; class ScheduledQueriesListItem extends Component { @@ -52,9 +52,9 @@ class ScheduledQueriesListItem extends Component { renderPlatformIcon = () => { const { scheduledQuery: { platform } } = this.props; - const platformArr = platform.split(','); + const platformArr = platform ? platform.split(',') : []; - if (platformArr.includes('all')) { + if (isEmpty(platformArr) || platformArr.includes('all')) { return ; } diff --git a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.tests.jsx b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.tests.jsx index d2268b7794..70aeb7470c 100644 --- a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.tests.jsx +++ b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/ScheduledQueriesListItem.tests.jsx @@ -24,6 +24,15 @@ describe('ScheduledQueriesListItem - component', () => { expect(component.find('PlatformIcon').length).toEqual(1); }); + it('renders when the platform attribute is null', () => { + const scheduledQuery = { ...scheduledQueryStub, platform: null }; + const component = mount(); + expect(component.text()).toInclude(scheduledQueryStub.name); + expect(component.text()).toInclude(scheduledQueryStub.interval); + expect(component.text()).toInclude(scheduledQueryStub.shard); + expect(component.find('PlatformIcon').length).toEqual(1); + }); + it('renders a Checkbox component', () => { const component = mount(); expect(component.find('Checkbox').length).toEqual(1);