diff --git a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx index 62a6336766..0261d4c65f 100644 --- a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx +++ b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx @@ -11,7 +11,7 @@ import validate from 'components/forms/ConfigurePackQueryForm/validate'; const baseClass = 'configure-pack-query-form'; const fieldNames = ['query_id', 'interval', 'logging_type', 'platform', 'shard', 'version']; const platformOptions = [ - { label: 'All', value: 'all' }, + { label: 'All', value: '' }, { label: 'Windows', value: 'windows' }, { label: 'Linux', value: 'linux' }, { label: 'macOS', value: 'darwin' }, diff --git a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.tests.jsx b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.tests.jsx index 42c278c10b..b0e07a5c17 100644 --- a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.tests.jsx +++ b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.tests.jsx @@ -46,7 +46,7 @@ describe('ConfigurePackQueryForm - component', () => { expect(spy).toHaveBeenCalledWith({ interval: 123, logging_type: 'differential', - platform: 'all', + platform: '', query_id: 1, version: '', shard: 12, diff --git a/frontend/kolide/index.js b/frontend/kolide/index.js index 58cc17c0cd..1c57b2e107 100644 --- a/frontend/kolide/index.js +++ b/frontend/kolide/index.js @@ -69,10 +69,10 @@ class Kolide extends Base { } labels = { - create: ({ description, name, query }) => { + create: ({ description, name, platform, query }) => { const { LABELS } = endpoints; - return this.authenticatedPost(this.endpoint(LABELS), JSON.stringify({ description, name, query })) + return this.authenticatedPost(this.endpoint(LABELS), JSON.stringify({ description, name, platform, query })) .then((response) => { const { label } = response; diff --git a/frontend/kolide/index.tests.js b/frontend/kolide/index.tests.js index 267c657bf3..f08e1aca6d 100644 --- a/frontend/kolide/index.tests.js +++ b/frontend/kolide/index.tests.js @@ -83,8 +83,9 @@ describe('Kolide - API client', () => { it('calls the appropriate endpoint with the correct parameters', (done) => { const description = 'label description'; const name = 'label name'; + const platform = 'windows'; const query = 'SELECT * FROM users'; - const labelParams = { description, name, query }; + const labelParams = { description, name, platform, query }; const request = validCreateLabelRequest(bearerToken, labelParams); Kolide.setBearerToken(bearerToken); diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx index 0db3631c89..d8e8a8cd65 100644 --- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx +++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx @@ -83,9 +83,12 @@ export class ManageHostsPage extends Component { componentDidMount () { const { dispatch } = this.props; const getEntities = () => { - dispatch(hostActions.silentLoadAll()); - dispatch(labelActions.silentLoadAll()); - dispatch(silentGetStatusLabelCounts); + dispatch(hostActions.silentLoadAll()) + .catch(() => false); + dispatch(labelActions.silentLoadAll()) + .catch(() => false); + dispatch(silentGetStatusLabelCounts) + .catch(() => false); }; this.interval = global.window.setInterval(getEntities, 5000); diff --git a/frontend/pages/packs/EditPackPage/EditPackPage.jsx b/frontend/pages/packs/EditPackPage/EditPackPage.jsx index f3e3b200e1..21ff22e08b 100644 --- a/frontend/pages/packs/EditPackPage/EditPackPage.jsx +++ b/frontend/pages/packs/EditPackPage/EditPackPage.jsx @@ -160,10 +160,6 @@ export class EditPackPage extends Component { } handleConfigurePackQuerySubmit = (formData) => { - if (formData.platform.indexOf('all') !== -1) { - formData.platform = ''; - } - const { create } = scheduledQueryActions; const { dispatch, packID } = this.props; const scheduledQueryData = {