Eslint improvements

pull/1365/head
Uku Taht 5 years ago
parent 3315b8cce5
commit 4c77df477f

@ -16,6 +16,7 @@
"no-unused-expressions": [1, { "allowShortCircuit": true }],
"no-unused-vars": [2, { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],
"jsx-a11y/click-events-have-key-events": [0],
"jsx-a11y/no-static-element-interactions": [0]
"jsx-a11y/no-static-element-interactions": [0],
"react/no-did-update-set-state": [0]
}
}

@ -6,7 +6,6 @@ import FadeIn from '../../fade-in'
import Bar from '../bar'
import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import { eventName } from '../../query'
import * as api from '../../api'
import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
@ -18,11 +17,6 @@ export default class EntryPages extends React.Component {
this.onVisible = this.onVisible.bind(this)
}
onVisible() {
this.fetchPages()
if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, pages: null})
@ -30,6 +24,11 @@ export default class EntryPages extends React.Component {
}
}
onVisible() {
this.fetchPages()
if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
}
showConversionRate() {
return !!this.props.query.filters.goal
}
@ -60,6 +59,7 @@ export default class EntryPages extends React.Component {
</Link>
<a
target="_blank"
rel="noreferrer"
href={externalLink}
className="hidden group-hover:block"
>

@ -6,7 +6,6 @@ import FadeIn from '../../fade-in'
import Bar from '../bar'
import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import { eventName } from '../../query'
import * as api from '../../api'
import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
@ -18,11 +17,6 @@ export default class ExitPages extends React.Component {
this.onVisible = this.onVisible.bind(this)
}
onVisible() {
this.fetchPages()
if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, pages: null})
@ -30,6 +24,11 @@ export default class ExitPages extends React.Component {
}
}
onVisible() {
this.fetchPages()
if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
}
showConversionRate() {
return !!this.props.query.filters.goal
}
@ -60,6 +59,7 @@ export default class ExitPages extends React.Component {
</Link>
<a
target="_blank"
rel="noreferrer"
href={externalLink}
className="hidden group-hover:block"
>
@ -76,7 +76,7 @@ export default class ExitPages extends React.Component {
renderList() {
if (this.state.pages && this.state.pages.length > 0) {
return (
<React.Fragment>
<>
<div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
<span>Page url</span>
<div className="text-right">
@ -88,11 +88,11 @@ export default class ExitPages extends React.Component {
<FlipMove>
{ this.state.pages.map(this.renderPage.bind(this)) }
</FlipMove>
</React.Fragment>
</>
)
} else {
return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
}
return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
}
render() {

@ -6,7 +6,6 @@ import FadeIn from '../../fade-in'
import Bar from '../bar'
import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import { eventName } from '../../query'
import * as api from '../../api'
import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
@ -18,11 +17,6 @@ export default class Visits extends React.Component {
this.onVisible = this.onVisible.bind(this)
}
onVisible() {
this.fetchPages()
if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, pages: null})
@ -30,6 +24,11 @@ export default class Visits extends React.Component {
}
}
onVisible() {
this.fetchPages()
if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
}
showConversionRate() {
return !!this.props.query.filters.goal
}
@ -39,6 +38,14 @@ export default class Visits extends React.Component {
.then((res) => this.setState({loading: false, pages: res}))
}
label() {
if (this.props.query.period === 'realtime') {
return 'Current visitors'
}
return 'Visitors'
}
renderPage(page) {
const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
@ -65,6 +72,7 @@ export default class Visits extends React.Component {
</Link>
<a
target="_blank"
rel="noreferrer"
href={externalLink}
className="hidden group-hover:block"
>
@ -78,19 +86,10 @@ export default class Visits extends React.Component {
)
}
label() {
const filters = this.props.query.filters
if (this.props.query.period === 'realtime') {
return 'Current visitors'
} else {
return 'Visitors'
}
}
renderList() {
if (this.state.pages && this.state.pages.length > 0) {
return (
<React.Fragment>
<>
<div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
<span>Page url</span>
<div className="text-right">
@ -102,11 +101,11 @@ export default class Visits extends React.Component {
<FlipMove>
{ this.state.pages.map(this.renderPage.bind(this)) }
</FlipMove>
</React.Fragment>
</>
)
} else {
return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
}
return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
}
render() {

@ -9,7 +9,7 @@ export function sitePath(site, path = '') {
export function setQuery(key, value) {
const query = new URLSearchParams(window.location.search)
query.set(key, value)
return window.location.pathname + '?' + query.toString();
return `${window.location.pathname}?${query.toString()}`
}
export function externalLinkForPage(domain, page) {

Loading…
Cancel
Save