diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js index 214e7e3db..ef519310b 100644 --- a/assets/js/dashboard/stats/devices/index.js +++ b/assets/js/dashboard/stats/devices/index.js @@ -5,7 +5,7 @@ import ListReport from '../reports/list' import * as api from '../../api' import * as url from '../../util/url' -function Browsers({query, site}) { +function Browsers({ query, site }) { function fetchData() { return api.get(url.apiPath(site, '/browsers'), query) } @@ -13,29 +13,41 @@ function Browsers({query, site}) { return ( ) } -function BrowserVersions({query, site}) { +function BrowserVersions({ query, site }) { function fetchData() { return api.get(url.apiPath(site, '/browser-versions'), query) } - return ( - - ) + if (query.filters.browser == "(not set)") { + return ( + + ) + } else { + return ( + + ) + } + } -function OperatingSystems({query, site}) { +function OperatingSystems({ query, site }) { function fetchData() { return api.get(url.apiPath(site, '/operating-systems'), query) } @@ -43,29 +55,41 @@ function OperatingSystems({query, site}) { return ( ) } -function OperatingSystemVersions({query, site}) { +function OperatingSystemVersions({ query, site }) { function fetchData() { return api.get(url.apiPath(site, '/operating-system-versions'), query) } - return ( - - ) + if (query.filters.os == "(not set)") { + return ( + + ) + } else { + return ( + + ) + } + } -function ScreenSizes({query, site}) { +function ScreenSizes({ query, site }) { function fetchData() { return api.get(url.apiPath(site, '/screen-sizes'), query) } @@ -81,7 +105,7 @@ function ScreenSizes({query, site}) { return ( + ) } else if (screenSize === 'Tablet') { return ( - + ) } else if (screenSize === 'Laptop') { return ( - + ) } else if (screenSize === 'Desktop') { return ( - + + ) + } else if (screenSize === '(not set)') { + return ( + + + ) } } @@ -120,18 +150,17 @@ function iconFor(screenSize) { export default class Devices extends React.Component { constructor(props) { super(props) - this.tabKey = `deviceTab__${ props.site.domain}` + this.tabKey = `deviceTab__${props.site.domain}` const storedTab = storage.getItem(this.tabKey) this.state = { mode: storedTab || 'size' } } - setMode(mode) { return () => { storage.setItem(this.tabKey, mode) - this.setState({mode}) + this.setState({ mode }) } } @@ -189,12 +218,12 @@ export default class Devices extends React.Component {

Devices

- { this.renderPill('Size', 'size') } - { this.renderPill('Browser', 'browser') } - { this.renderPill('OS', 'os') } + {this.renderPill('Size', 'size')} + {this.renderPill('Browser', 'browser')} + {this.renderPill('OS', 'os')}
- { this.renderContent() } + {this.renderContent()} )